stas 2003/12/16 16:53:58
Modified: t/response/TestModules proxy.pm
t/filter/TestFilter both_str_req_proxy.pm
Log:
no need to dup the whole config section to support 2.1, dup just the access
container
Revision Changes Path
1.3 +14 -26 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.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- proxy.pm 28 Oct 2003 18:32:48 -0000 1.2
+++ proxy.pm 17 Dec 2003 00:53:58 -0000 1.3
@@ -44,39 +44,27 @@
__END__
<NoAutoConfig>
<IfModule mod_proxy.c>
- # 2.0
- <IfModule mod_access.c>
- <Proxy http://@servername@:@port@/*>
+ <Proxy http://@servername@:@port@/*>
+ # 2.0
+ <IfModule mod_access.c>
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>
-
- # 2.1
- <IfModule mod_authz_host.c>
- <Proxy http://@servername@:@port@/*>
+ </IfModule>
+ # 2.1
+ <IfModule mod_authz_host.c>
Order Deny,Allow
Deny from all
Allow from @servername@
- </Proxy>
- ProxyRequests On
+ </IfModule>
+ </Proxy>
- 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>
</NoAutoConfig>
1.4 +14 -25 modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm
Index: both_str_req_proxy.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_req_proxy.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- both_str_req_proxy.pm 2 Dec 2003 15:49:22 -0000 1.3
+++ both_str_req_proxy.pm 17 Dec 2003 00:53:58 -0000 1.4
@@ -58,39 +58,28 @@
__DATA__
<NoAutoConfig>
<IfModule mod_proxy.c>
-
- # 2.0
- <IfModule mod_access.c>
- <Proxy http://@servername@:@port@/*>
+ <Proxy http://@servername@:@port@/*>
+ # 2.0
+ <IfModule mod_access.c>
Order Deny,Allow
Deny from all
Allow from @servername@
- </Proxy>
- ProxyRequests Off
- RewriteEngine On
-
- ProxyPass /TestFilter__both_str_req_proxy/ \
- http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
- ProxyPassReverse /TestFilter__both_str_req_proxy/ \
- http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
- </IfModule>
-
- # 2.1
- <IfModule mod_authz_host.c>
- <Proxy http://@servername@:@port@/*>
+ </IfModule>
+ # 2.1
+ <IfModule mod_authz_host.c>
Order Deny,Allow
Deny from all
Allow from @servername@
- </Proxy>
- ProxyRequests Off
- RewriteEngine On
+ </IfModule>
+ </Proxy>
- ProxyPass /TestFilter__both_str_req_proxy/ \
- http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
- ProxyPassReverse /TestFilter__both_str_req_proxy/ \
- http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
- </IfModule>
+ ProxyRequests Off
+ RewriteEngine On
+ ProxyPass /TestFilter__both_str_req_proxy/ \
+ http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
+ ProxyPassReverse /TestFilter__both_str_req_proxy/ \
+ http://@servername@:@port@/TestFilter__both_str_req_proxy_content/
</IfModule>
PerlModule TestFilter::both_str_req_proxy
