[interchange-cvs] interchange - heins modified scripts/interchange.PL

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Wed Feb 6 21:16:01 2002


User:      heins
Date:      2002-02-07 02:15:21 GMT
Modified:  scripts  interchange.PL
Log:
	* Prevent $::Pragma stuff from persisting in PreFork mode. I don't
	  know what to do about $::Variable -- perhaps

		my %hash;
		tie '%hash', 'Tie::ShadowHash', $Vend::Cfg->{Variable};
	  	$Vend::Interpolate::Variable = \%hash;

	  but I don't know. It does explain one or two things, though.

	* Obviously not a problem in forking mode.

Revision  Changes    Path
2.23      +9 -3      interchange/scripts/interchange.PL


rev 2.23, prev_rev 2.22
Index: interchange.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/scripts/interchange.PL,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -r2.22 -r2.23
--- interchange.PL	5 Feb 2002 20:57:04 -0000	2.22
+++ interchange.PL	7 Feb 2002 02:15:21 -0000	2.23
@@ -50,7 +50,7 @@
 #
 # Interchange version 4.9.0
 #
-# $Id: interchange.PL,v 2.22 2002/02/05 20:57:04 mheins Exp $
+# $Id: interchange.PL,v 2.23 2002/02/07 02:15:21 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -645,6 +645,12 @@
 
 	while (($key, $value) = each %CGI::values) {
 		next unless defined $data{$key};
+		if($CGI::values{"mv_data_prep_$key"}) {
+			$value = Vend::Interpolate::filter_value(
+						 $CGI::values{"mv_data_prep_$key"},
+						 $value
+						 );
+		}
 		$count = (@{$data{$key}} = split /\0/, $value, -1);
 		$max = $count, $maxname = $key if $count > $max;
 		$min = $count, $minname = $key if $count < $min;
@@ -835,7 +841,7 @@
 # LEGACY
 			HTML::Entities::decode($value) if $decode;
 # END LEGACY
-			if(defined $CGI::values{"mv_data_filter_$_"}) {
+			if($CGI::values{"mv_data_filter_$_"}) {
 				$value = Vend::Interpolate::filter_value(
 							 $CGI::values{"mv_data_filter_$_"},
 							 $value,
@@ -1835,7 +1841,7 @@
 			unless $Vend::Cfg->{Static};
 	}
 	$::Variable = $Vend::Cfg->{Variable};
-	$::Pragma   = $Vend::Cfg->{Pragma};
+	$::Pragma   = { %{ $Vend::Cfg->{Pragma} } };
 
 	if (defined $Global::SelectorAlias{$CGI::script_name}
 		and ! defined $Vend::InternalHTTP                 )