geoff 2004/08/23 14:16:27
Modified: . Changes
lib/Apache PerlSections.pm Status.pm
src/modules/perl modperl_cmd.c
t/conf extra.last.conf.in
Log:
$Apache::Server::SaveConfig is now $Apache::PerlSections::Save
Reviewed by: gozer
Revision Changes Path
1.466 +2 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- Changes 23 Aug 2004 20:43:15 -0000 1.465
+++ Changes 23 Aug 2004 21:16:27 -0000 1.466
@@ -15,6 +15,8 @@
Fix $s->log->*, $s->log_error and $s->log_serror to again log into the
vhost's error_log file (if there is one). [Stas]
+$Apache::Server::SaveConfig is now $Apache::PerlSections::Save
+[Geoffrey Young]
1.7 +1 -1 modperl-2.0/lib/Apache/PerlSections.pm
Index: PerlSections.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/PerlSections.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PerlSections.pm 9 Aug 2004 00:17:05 -0000 1.6
+++ PerlSections.pm 23 Aug 2004 21:16:27 -0000 1.7
@@ -39,7 +39,7 @@
sub package { return shift->{'args'}->{'package'} }
my @saved;
-sub save { return $Apache::Server::SaveConfig }
+sub save { return $Apache::PerlSections::Save }
sub saved { return @saved }
sub handler : method {
1.28 +1 -1 modperl-2.0/lib/Apache/Status.pm
Index: Status.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Status.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Status.pm 16 Jul 2004 01:10:45 -0000 1.27
+++ Status.pm 23 Aug 2004 21:16:27 -0000 1.28
@@ -67,7 +67,7 @@
delete $status{'sig'} if IS_WIN32;
# XXX: needs porting
-if ($Apache::Server::SaveConfig) {
+if ($Apache::PerlSections::Save) {
$status{"section_config"} = "Perl Section Configuration";
}
1.64 +1 -1 modperl-2.0/src/modules/perl/modperl_cmd.c
Index: modperl_cmd.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- modperl_cmd.c 7 Aug 2004 03:09:05 -0000 1.63
+++ modperl_cmd.c 23 Aug 2004 21:16:27 -0000 1.64
@@ -482,7 +482,7 @@
#define MP_DEFAULT_PERLSECTION_HANDLER "Apache::PerlSections"
#define MP_DEFAULT_PERLSECTION_PACKAGE "Apache::ReadConfig"
#define MP_PERLSECTIONS_SAVECONFIG_SV \
- get_sv("Apache::Server::SaveConfig", FALSE)
+ get_sv("Apache::PerlSections::Save", FALSE)
MP_CMD_SRV_DECLARE(perldo)
{
1.24 +2 -2 modperl-2.0/t/conf/extra.last.conf.in
Index: extra.last.conf.in
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/extra.last.conf.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- extra.last.conf.in 8 Aug 2004 23:50:48 -0000 1.23
+++ extra.last.conf.in 23 Aug 2004 21:16:27 -0000 1.24
@@ -17,7 +17,7 @@
tie %Location, 'ModPerl::TestTiePerlSection';
$Location{'/tied'} = 'test_tied';
-$Apache::Server::SaveConfig = 1;
+$Apache::PerlSections::Save = 1;
$Location{'/perl_sections_saved'} = {
'AuthName' => 'PerlSection',
};
@@ -27,7 +27,7 @@
</Perl>
<Perl >
-$Apache::Server::SaveConfig = 1;
+$Apache::PerlSections::Save = 1;
$TestDirective::perl::filename = __FILE__;
$TestDirective::perl::dollar_zero = $0;
$TestDirective::perl::line = __LINE__;
