Author: markt
Date: Tue Sep 6 21:26:03 2016
New Revision: 1759513
URL: http://svn.apache.org/viewvc?rev=1759513&view=rev
Log:
Add new tests for Bug 60013
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1759513&r1=1759512&r2=1759513&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Tue Sep 6 21:26:03 2016
@@ -140,11 +140,27 @@ public class TestRewriteValve extends To
@Test
- public void testNonAsciiQueryStringAndRedirectPath() throws Exception {
+ public void testNonAsciiQueryStringAndPath() throws Exception {
doTestRewrite("RewriteRule ^/b/(.*)/(.*) /c/$1?$2",
"/b/%E5%9C%A8%E7%BA%BF/id=%E6%B5%8B%E8%AF%95",
"/c/%E5%9C%A8%E7%BA%BF", "id=%E6%B5%8B%E8%AF%95");
}
+
+ @Test
+ public void testNonAsciiQueryStringRedirect() throws Exception {
+ doTestRewrite("RewriteRule ^/b/(.*) /c?$1 [R]",
+ "/b/id=%E5%9C%A8%E7%BA%BF%E6%B5%8B%E8%AF%95",
+ "/c", "id=%E5%9C%A8%E7%BA%BF%E6%B5%8B%E8%AF%95");
+ }
+
+
+ @Test
+ public void testNonAsciiQueryStringAndRedirectPath() throws Exception {
+ doTestRewrite("RewriteRule ^/b/(.*)/(.*) /c/$1?$2 [R]",
+ "/b/%E5%9C%A8%E7%BA%BF/id=%E6%B5%8B%E8%AF%95",
+ "/c/%E5%9C%A8%E7%BA%BF", "id=%E6%B5%8B%E8%AF%95");
+ }
+
private void doTestRewrite(String config, String request, String
expectedURI,
String expectedQueryString) throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
