geoff 2003/10/28 10:32:48
Modified: t/modules proxy.t
t/response/TestModules proxy.pm
Log:
allow proxy tests to run on 2.1
Revision Changes Path
1.2 +2 -1 modperl-2.0/t/modules/proxy.t
Index: proxy.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modules/proxy.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proxy.t 26 Aug 2003 23:28:04 -0000 1.1
+++ proxy.t 28 Oct 2003 18:32:48 -0000 1.2
@@ -8,7 +8,8 @@
my $location = "/TestModules__proxy";
-plan tests => 1, [qw(proxy access)];
+plan tests => 1, (have_module('proxy') &&
+ have_access);
my $expected = "ok";
my $received = GET_BODY_ASSERT $location;
1.2 +32 -14 modperl-2.0/t/response/TestModules/proxy.pm
Index: proxy.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModules/proxy.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proxy.pm 26 Aug 2003 23:28:04 -0000 1.1
+++ proxy.pm 28 Oct 2003 18:32:48 -0000 1.2
@@ -44,21 +44,39 @@
__END__
<NoAutoConfig>
<IfModule mod_proxy.c>
- <IfModule mod_access.c>
- <Proxy http://@servername@:@port@/*>
- Order Deny,Allow
- Deny from all
- Allow from @servername@
- </Proxy>
- ProxyRequests On
+ # 2.0
+ <IfModule mod_access.c>
+ <Proxy http://@servername@:@port@/*>
+ Order Deny,Allow
+ Deny from all
+ Allow from @servername@
+ </Proxy>
+ ProxyRequests On
- PerlModule TestModules::proxy
- PerlTransHandler TestModules::proxy::proxy
- <Location /TestModules__proxy_real>
- SetHandler modperl
- PerlResponseHandler TestModules::proxy::response
- </Location>
- </IfModule>
+ PerlModule TestModules::proxy
+ PerlTransHandler TestModules::proxy::proxy
+ <Location /TestModules__proxy_real>
+ SetHandler modperl
+ PerlResponseHandler TestModules::proxy::response
+ </Location>
+ </IfModule>
+
+ # 2.1
+ <IfModule mod_authz_host.c>
+ <Proxy http://@servername@:@port@/*>
+ Order Deny,Allow
+ Deny from all
+ Allow from @servername@
+ </Proxy>
+ ProxyRequests On
+
+ PerlModule TestModules::proxy
+ PerlTransHandler TestModules::proxy::proxy
+ <Location /TestModules__proxy_real>
+ SetHandler modperl
+ PerlResponseHandler TestModules::proxy::response
+ </Location>
+ </IfModule>
</IfModule>
</NoAutoConfig>
