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

[jorton]

jorton      2004/08/11 01:42:36

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  Fix detection of statically linked modules with 2.1.
  
  Submitted by: Stas
  Monkeyed by: Joe
  
  Revision  Changes    Path
  1.236     +7 -7      
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.235
  retrieving revision 1.236
  diff -d -w -u -r1.235 -r1.236
  --- TestConfig.pm     9 Aug 2004 06:19:15 -0000       1.235
  +++ TestConfig.pm     11 Aug 2004 08:42:36 -0000      1.236
  @@ -313,13 +313,6 @@
       $vars->{proxyssl_url} ||= '';
       $vars->{defines}      ||= '';
   
  -    $self->default_module(cgi    => [qw(mod_cgi mod_cgid)]);
  -    $self->default_module(thread => [qw(worker threaded)]);
  -    $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->{hostport} = $self->hostport;
       $self->{server} = $self->new_test_server;
   
  @@ -360,6 +353,13 @@
   
       $self->inherit_config; #see TestConfigParse.pm
       $self->configure_httpd_eapi; #must come after inherit_config
  +
  +    $self->default_module(cgi    => [qw(mod_cgi mod_cgid)]);
  +    $self->default_module(thread => [qw(worker threaded)]);
  +    $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->{server}->post_config;