You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2001/10/16 02:45:28 UTC

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

dougm       01/10/15 17:45:28

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
  Log:
  fixup some module names so they are the same if module is static of shared.
  fixes t/modules/info test with --enable-mods-shared=all
  
  Revision  Changes    Path
  1.14      +9 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TestConfigParse.pm	2001/09/27 03:39:53	1.13
  +++ TestConfigParse.pm	2001/10/16 00:45:28	1.14
  @@ -63,6 +63,14 @@
                              $self->server_file($c->{$directive}));
   }
   
  +#so we have the same names if these modules are linked static or shared
  +my %modname_alias = (
  +    'mod_pop.c'           => 'pop_core.c',
  +    'mod_proxy_http.c'    => 'proxy_http.c',
  +    'mod_proxy_ftp.c'     => 'proxy_ftp.c',
  +    'mod_proxy_connect.c' => 'proxy_connect.c',
  +);
  +
   #inherit LoadModule
   sub inherit_load_module {
       my($self, $c, $directive) = @_;
  @@ -75,6 +83,7 @@
           $name =~ s/\.so$/.c/;  #mod_info.so => mod_info.c
           $name =~ s/^lib/mod_/; #libphp4.so => mod_php4.c
           $self->trace("LoadModule $modname $name");
  +        $name = $modname_alias{$name} if $modname_alias{$name};
           $self->{modules}->{$name} = 1;
   
           $self->preamble($directive => "$modname $file");