Author: jorton Date: Mon Feb 7 08:09:15 2005 New Revision: 151726 URL: http://svn.apache.org/viewcvs?view=rev&rev=151726 Log: Remove mod_proxy module name aliases for httpd>=2.1.
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm?view=diff&r1=151725&r2=151726 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm Mon Feb 7 08:09:15 2005 @@ -439,9 +439,16 @@ $self->{mpm} = ''; } - if (($self->{httpd_info}->{VERSION}||'') =~ qr,Apache/2,) { - # PHP 4.x on httpd-2.x needs a special modname alias; + my $version = $self->{httpd_info}->{VERSION} || ''; + + if ($version =~ qr,Apache/2,) { + # PHP 4.x on httpd-2.x needs a special modname alias: $modname_alias{'mod_php4.c'} = 'sapi_apache2.c'; + } + + unless ($version =~ qr,Apache/(2.0|1.3),) { + # for 2.1 and later, mod_proxy_* are really called mod_proxy_* + delete @modname_alias{grep {/^mod_proxy_/} keys %modname_alias}; } }