cvs commit: modperl-2.0/todo release
stas2003/11/23 00:47:29 Modified:todo release Log: perrin will port Apache::SizeLimit to mp2 Revision ChangesPath 1.4 +2 -2 modperl-2.0/todo/release Index: release === RCS file: /home/cvs/modperl-2.0/todo/release,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- release 18 Nov 2003 21:45:18 - 1.3 +++ release 23 Nov 2003 08:47:29 - 1.4 @@ -125,8 +125,8 @@ thread's size, can we use B::Size and B::TerseSize? prefork: -Apache::SizeLimit (???) -Apache::GTopLimit (???) +Apache::SizeLimit - Owner: perrin +Apache::GTopLimit - Owner: stas threaded: Garbage Collector thread
cvs commit: modperl-2.0/ModPerl-Registry/t/cgi-bin basic.pl
stas2003/11/23 13:01:50
Modified:ModPerl-Registry/t basic.t redirect.t
ModPerl-Registry/t/cgi-bin basic.pl
Log:
test that $0 is set to the path to the script
Revision ChangesPath
1.15 +6 -1 modperl-2.0/ModPerl-Registry/t/basic.t
Index: basic.t
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/basic.t,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- basic.t 1 Apr 2003 04:18:49 - 1.14
+++ basic.t 23 Nov 2003 21:01:50 - 1.15
@@ -6,6 +6,8 @@
use Apache::TestRequest qw(GET GET_BODY HEAD);
use Apache::TestConfig ();
+use File::Spec::Functions qw(catfile);
+
my %modules = (
registry=> 'ModPerl::Registry',
registry_bb => 'ModPerl::RegistryBB',
@@ -16,12 +18,15 @@
plan tests => @aliases * 4 + 3;
+my $vars = Apache::Test::config()->{vars};
+my $script_file = catfile $vars->{serverroot}, 'cgi-bin', 'basic.pl';
+
# very basic compilation/response test
for my $alias (@aliases) {
my $url = "/$alias/basic.pl";
ok t_cmp(
-"ok",
+"ok $script_file",
GET_BODY($url),
"$modules{$alias} basic cgi test",
);
1.6 +5 -2 modperl-2.0/ModPerl-Registry/t/redirect.t
Index: redirect.t
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/redirect.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- redirect.t12 Aug 2003 21:06:40 - 1.5
+++ redirect.t23 Nov 2003 21:01:50 - 1.6
@@ -5,18 +5,21 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY HEAD);
+use File::Spec::Functions qw(catfile);
+
plan tests => 4, have_lwp;
# need LWP to handle redirects
-
my $base_url = "/registry/redirect.pl";
{
my $redirect_path = "/registry/basic.pl";
my $url = "$base_url?$redirect_path";
+my $vars = Apache::Test::config()->{vars};
+my $script_file = catfile $vars->{serverroot}, 'cgi-bin', 'basic.pl';
ok t_cmp(
-"ok",
+"ok $script_file",
GET_BODY($url),
"test redirect: existing target",
);
1.3 +1 -1 modperl-2.0/ModPerl-Registry/t/cgi-bin/basic.pl
Index: basic.pl
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/cgi-bin/basic.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- basic.pl 16 Aug 2002 10:11:39 - 1.2
+++ basic.pl 23 Nov 2003 21:01:50 - 1.3
@@ -3,7 +3,7 @@
# test all the basic functionality
print "Content-type: text/plain\n\n";
-print "ok";
+print "ok $0";
__END__
cvs commit: modperl-2.0 Changes
stas2003/11/23 13:26:01
Modified:ModPerl-Registry/lib/ModPerl PerlRun.pm Registry.pm
RegistryCooker.pm
.Changes
Log:
Fix ModPerl::Registry handlers family to modify $0 only for the
duration of the handler, by localizing it
Revision ChangesPath
1.7 +1 -1 modperl-2.0/ModPerl-Registry/lib/ModPerl/PerlRun.pm
Index: PerlRun.pm
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/PerlRun.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- PerlRun.pm23 Mar 2003 04:52:24 - 1.6
+++ PerlRun.pm23 Nov 2003 21:26:01 - 1.7
@@ -37,7 +37,7 @@
cache_it=> 'NOP',
read_script => 'read_script',
rewrite_shebang => 'rewrite_shebang',
-set_script_name => 'set_script_name',
+get_script_name => 'get_script_name',
chdir_file => 'chdir_file_normal',
get_mark_line => 'get_mark_line',
compile => 'compile',
1.8 +1 -1 modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm
Index: Registry.pm
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- Registry.pm 23 Mar 2003 04:52:24 - 1.7
+++ Registry.pm 23 Nov 2003 21:26:01 - 1.8
@@ -37,7 +37,7 @@
cache_it=> 'cache_it',
read_script => 'read_script',
rewrite_shebang => 'rewrite_shebang',
-set_script_name => 'set_script_name',
+get_script_name => 'get_script_name',
chdir_file => 'chdir_file_normal',
get_mark_line => 'get_mark_line',
compile => 'compile',
1.38 +10 -8 modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
Index: RegistryCooker.pm
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -u -r1.37 -r1.38
--- RegistryCooker.pm 30 Aug 2003 02:39:45 - 1.37
+++ RegistryCooker.pm 23 Nov 2003 21:26:01 - 1.38
@@ -173,7 +173,6 @@
my $r = $self->{REQ};
my $package = $self->{PACKAGE};
-$self->set_script_name;
$self->chdir_file;
my $cv = \&{"$package\::handler"};
@@ -356,10 +355,13 @@
$self->strip_end_data_segment;
+my $script_name = $self->get_script_name || $0;
+
my $eval = join '',
'package ',
$self->{PACKAGE}, ";",
-"sub handler {\n",
+"sub handler {",
+"local \$0 = '$script_name';",
$line,
${ $self->{CODE} },
"\n}"; # last line comment without newline?
@@ -568,15 +570,15 @@
}
#
-# func: set_script_name
-# dflt: set_script_name
-# desc: set $0 to the script's name
+# func: get_script_name
+# dflt: get_script_name
+# desc: get the script's name to set into $0
# args: $self - registry blessed object
-# rtrn: nothing
+# rtrn: path to the script's filename
#
-sub set_script_name {
-*0 = \(shift->{FILENAME});
+sub get_script_name {
+shift->{FILENAME};
}
#
1.260 +3 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -u -r1.259 -r1.260
--- Changes 22 Nov 2003 10:27:42 - 1.259
+++ Changes 23 Nov 2003 21:26:01 - 1.260
@@ -12,6 +12,9 @@
=item 1.99_12-dev
+Fix ModPerl::Registry handlers family to modify $0 only for the
+duration of the handler, by localizing it [Stas]
+
Fix :Apache perlio's STDOUT to be reentrant + modules/include_subreq
test [Stas]
