cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigPerl.pm

[geoff]

geoff       2003/10/07 10:44:58

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigPerl.pm
  Log:
  place mod_perl-specific directives in <IfModule> containers
  within httpd.conf, allowing the default server to start if
  mod_perl isn't present.
  
  Revision  Changes    Path
  1.177     +1 -1      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- TestConfig.pm     6 Oct 2003 20:04:47 -0000       1.176
  +++ TestConfig.pm     7 Oct 2003 17:44:58 -0000       1.177
  @@ -1259,7 +1259,7 @@
                   $entry = qq(Include "$file");
               }
               elsif ($file =~ /\.pl$/) {
  -                $entry = qq(PerlRequire "$file");
  +                $entry = qq(<IfModule mod_perl.c>\n\tPerlRequire 
"$file"\n</IfModule>\n);
               }
               else {
                   next;
  
  
  
  1.77      +6 -3      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- TestConfigPerl.pm 12 Aug 2003 23:36:51 -0000      1.76
  +++ TestConfigPerl.pm 7 Oct 2003 17:44:58 -0000       1.77
  @@ -125,7 +125,8 @@
   # propogate trace overrides to the server
   sub configure_trace {
       my $self = shift;
  -    $self->postamble(PerlPassEnv => 'APACHE_TEST_TRACE_LEVEL');
  +    $self->postamble(IfModule => 'mod_perl.c',
  +                     "PerlPassEnv APACHE_TEST_TRACE_LEVEL\n");
   }
   
   sub startup_pl_code {
  @@ -163,7 +164,8 @@
       }
   
       if ($self->server->{rev} >= 2) {
  -        $self->postamble(PerlSwitches => 
"-Mlib=$self->{vars}->{serverroot}");
  +        $self->postamble(IfModule => 'mod_perl.c',
  +                         "PerlSwitches -Mlib=$self->{vars}->{serverroot}\n");
       }
   
       my $startup_pl = catfile $self->{vars}->{t_conf}, 'modperl_startup.pl';
  @@ -174,7 +176,8 @@
           close $fh;
       }
   
  -    $self->postamble(PerlRequire => $startup_pl);
  +    $self->postamble(IfModule => 'mod_perl.c',
  +                     "PerlRequire $startup_pl\n");
   }
   
   my %sethandler_modperl = (1 => 'perl-script', 2 => 'modperl');