svn commit: r1365109 - in /httpd/test/framework/trunk/t: conf/extra.conf.in conf/proxy.conf.in modules/proxy.t

[jo...@apache.org]

Author: jorton
Date: Tue Jul 24 15:06:25 2012
New Revision: 1365109

URL: http://svn.apache.org/viewvc?rev=1365109&view=rev
Log:
- add test case for PR 45434, seems to be a 2.2->2.4 regression?

Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/conf/proxy.conf.in
    httpd/test/framework/trunk/t/modules/proxy.t

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1365109&r1=1365108&r2=1365109&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Tue Jul 24 15:06:25 2012
@@ -322,6 +322,8 @@
     RedirectTemp /temp2 http://@SERVERNAME@:@PORT@/alias/index.html
     RedirectPermanent /perm2 http://@SERVERNAME@:@PORT@/alias/index.html
 
+    Redirect permanent /modules/alias/redirect-me http://@SERVERNAME@:@PORT@/modules/alias/5.html
+
     ScriptAlias /cgi @SERVERROOT@/htdocs/modules/alias
     ScriptAliasMatch /aliascgi-(.*) @SERVERROOT@/htdocs/modules/alias/$1
 </IfModule>

Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/proxy.conf.in?rev=1365109&r1=1365108&r2=1365109&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/proxy.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/proxy.conf.in Tue Jul 24 15:06:25 2012
@@ -30,7 +30,16 @@
        ProxyPass balancer://foo/
      </Location>
 
+     ## PR 45434 tests
+     <Proxy balancer://pr45434>
+       BalancerMember http://@SERVERNAME@:@PORT@/modules
+     </Proxy> 
+     
+     ProxyPass /pr45434 balancer://pr45434/alias
+     ProxyPassReverse /pr45434 balancer://pr45434/alias
+
    </VirtualHost>
+
 </IfModule>
 
 <IfModule mod_rewrite.c>

Modified: httpd/test/framework/trunk/t/modules/proxy.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy.t?rev=1365109&r1=1365108&r2=1365109&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy.t Tue Jul 24 15:06:25 2012
@@ -6,7 +6,7 @@ use Apache::TestRequest;
 use Apache::TestUtil;
 use Apache::TestConfig ();
 
-plan tests => 15, need_module 'proxy';
+plan tests => 17, need_module 'proxy';
 
 Apache::TestRequest::module("proxy_http_reverse");
 Apache::TestRequest::user_agent(requests_redirectable => 0);
@@ -65,7 +65,16 @@ if (have_module('alias')) {
     $r = GET("/reverse/perm");
     ok t_cmp($r->code, 301, "reverse proxy of redirect");
     ok t_cmp($r->header("Location"), qr{http://[^/]*/reverse/alias}, "reverse proxy rewrote redirect");
+
+    # More complex reverse mapping case with the balancer, PR 45434
+    Apache::TestRequest::module("proxy_http_balancer");
+    my $hostport = Apache::TestRequest::hostport();
+    $r = GET("/pr45434/redirect-me");
+    ok t_cmp($r->code, 301, "reverse proxy of redirect via balancer");
+    ok t_cmp($r->header("Location"), "http://$hostport/pr45434/5.html", "reverse proxy via balancer rewrote redirect");
+    Apache::TestRequest::module("proxy_http_reverse"); # flip back 
+
 } else {
-    skip "skipping tests without mod_alias" foreach (1..2);
+    skip "skipping tests without mod_alias" foreach (1..4);
 }