httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestConfigParse.pm
Date Wed, 20 Oct 2004 13:12:42 GMT
jorton      2004/10/20 06:12:41

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigParse.pm
  Log:
  Generate PHP_MODULE correctly for PHP 4.x on httpd-2.x.  Tested to
  not break PHP 5.x on 2.x also but no other combinations.
  
  Revision  Changes    Path
  1.249     +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.248
  retrieving revision 1.249
  diff -d -w -u -r1.248 -r1.249
  --- TestConfig.pm	23 Sep 2004 00:34:57 -0000	1.248
  +++ TestConfig.pm	20 Oct 2004 13:12:41 -0000	1.249
  @@ -380,7 +380,7 @@
       $self->default_module(ssl    => [qw(mod_ssl)]);
       $self->default_module(access => [qw(mod_access mod_authz_host)]);
       $self->default_module(auth   => [qw(mod_auth mod_auth_basic)]);
  -    $self->default_module(php    => [qw(mod_php4 mod_php5)]);
  +    $self->default_module(php    => [qw(sapi_apache2 mod_php4 mod_php5)]);
   
       $self->{server}->post_config;
   
  
  
  
  1.48      +5 -0      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
  
  Index: TestConfigParse.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -d -w -u -r1.47 -r1.48
  --- TestConfigParse.pm	20 Aug 2004 09:41:58 -0000	1.47
  +++ TestConfigParse.pm	20 Oct 2004 13:12:41 -0000	1.48
  @@ -429,6 +429,11 @@
           # Apache 1.3 - no mpm to speak of
           $self->{mpm} = '';
       }
  +
  +    if ($self->{httpd_info}->{VERSION} =~ qr,Apache/2,) {
  +        # PHP 4.x on httpd-2.x needs a special modname alias;
  +        $modname_alias{'mod_php4.c'} = 'sapi_apache2.c';
  +    }
   }
   
   sub httpd_version {
  
  
  

Mime
View raw message