Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 74820 invoked from network); 23 Mar 2009 15:53:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Mar 2009 15:53:23 -0000 Received: (qmail 67593 invoked by uid 500); 23 Mar 2009 15:53:22 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 67490 invoked by uid 500); 23 Mar 2009 15:53:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 67481 invoked by uid 99); 23 Mar 2009 15:53:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2009 15:53:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2009 15:53:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67461238896F; Mon, 23 Mar 2009 15:52:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r757421 - in /httpd/test/framework/trunk/t: conf/proxy.conf.in htdocs/modules/proxy/rewrite/ htdocs/modules/proxy/rewrite/.htaccess htdocs/modules/rewrite/foo bar.html modules/rewrite.t Date: Mon, 23 Mar 2009 15:52:52 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090323155252.67461238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Mon Mar 23 15:52:51 2009 New Revision: 757421 URL: http://svn.apache.org/viewvc?rev=757421&view=rev Log: - add test case for PR 46428 Added: httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/ httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/.htaccess httpd/test/framework/trunk/t/htdocs/modules/rewrite/foo bar.html Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in httpd/test/framework/trunk/t/modules/rewrite.t 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=757421&r1=757420&r2=757421&view=diff ============================================================================== --- httpd/test/framework/trunk/t/conf/proxy.conf.in (original) +++ httpd/test/framework/trunk/t/conf/proxy.conf.in Mon Mar 23 15:52:51 2009 @@ -32,3 +32,9 @@ + + + + AllowOverride All + + Added: httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/.htaccess URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/.htaccess?rev=757421&view=auto ============================================================================== --- httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/.htaccess (added) +++ httpd/test/framework/trunk/t/htdocs/modules/proxy/rewrite/.htaccess Mon Mar 23 15:52:51 2009 @@ -0,0 +1,2 @@ +RewriteEngine on +RewriteRule ^(.*)$ /modules/rewrite/$1 [P,L] Added: httpd/test/framework/trunk/t/htdocs/modules/rewrite/foo bar.html URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/modules/rewrite/foo%20bar.html?rev=757421&view=auto ============================================================================== --- httpd/test/framework/trunk/t/htdocs/modules/rewrite/foo bar.html (added) +++ httpd/test/framework/trunk/t/htdocs/modules/rewrite/foo bar.html Mon Mar 23 15:52:51 2009 @@ -0,0 +1 @@ +foo bar Modified: httpd/test/framework/trunk/t/modules/rewrite.t URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/rewrite.t?rev=757421&r1=757420&r2=757421&view=diff ============================================================================== --- httpd/test/framework/trunk/t/modules/rewrite.t (original) +++ httpd/test/framework/trunk/t/modules/rewrite.t Mon Mar 23 15:52:51 2009 @@ -14,7 +14,7 @@ my @url = qw(forbidden gone perm temp); my $r; -plan tests => @map * @num + 10, need_module 'rewrite'; +plan tests => @map * @num + 11, need_module 'rewrite'; foreach (@map) { foreach my $n (@num) { @@ -61,8 +61,13 @@ $r = GET_BODY("/modules/rewrite/proxy.html"); chomp $r; ok t_cmp($r, "JACKPOT", "request was proxied"); + + # PR 46428 + $r = GET_BODY("/modules/proxy/rewrite/foo bar.html"); + chomp $r; + ok t_cmp($r, "foo bar", "per-dir proxied rewrite escaping worked"); } else { - skip "Skipping rewrite to proxy; no proxy module."; + skip "Skipping rewrite to proxy; no proxy module." foreach (1..2); } if (have_module('mod_proxy') && have_cgi) {