stas 2003/03/07 20:11:09
Modified: lib/Apache PerlRun.pm
. Changes
Log:
don't use $r variable in Apache::PerlRun::compile(), so the script
won't use use inherited $r by mistake
Revision Changes Path
1.41 +6 -4 modperl/lib/Apache/PerlRun.pm
Index: PerlRun.pm
===================================================================
RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PerlRun.pm 12 Aug 2002 07:11:39 -0000 1.40
+++ PerlRun.pm 8 Mar 2003 04:11:09 -0000 1.41
@@ -112,15 +112,17 @@
sub compile {
my($pr, $eval) = @_;
$eval ||= $pr->{'sub'};
- my $r = $pr->{r};
- $r->clear_rgy_endav;
- $r->log_error("Apache::PerlRun->compile") if $Debug && $Debug & 4;
+ # don't use $r, but something else, so the script won't use
+ # inherited $r by mistake
+ my $_r = $pr->{r};
+ $_r->clear_rgy_endav;
+ $_r->log_error("Apache::PerlRun->compile") if $Debug && $Debug & 4;
Apache->untaint($$eval);
{
no strict; #so eval'd code doesn't inherit our bits
eval $$eval;
}
- $r->stash_rgy_endav;
+ $_r->stash_rgy_endav;
return $pr->error_check;
}
1.664 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- Changes 23 Feb 2003 22:47:49 -0000 1.663
+++ Changes 8 Mar 2003 04:11:09 -0000 1.664
@@ -10,6 +10,9 @@
=item 1.27_01-dev
+don't use $r variable in Apache::PerlRun::compile(), so the script
+won't use use inherited $r by mistake [Stas Bekman]
+
define PERL_DIRECTIVE_HANDLERS so that ModuleConfig.c gets
generated when building on Win32 within Visual Studio
[John Petrakis <[EMAIL PROTECTED]>]
