[tomcat] 03/03: Fix BZ 64432. Refactoring broke multi-line rewrite rules

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 006886935d9ab1e1a7bfdc7c42ac0340a39a3280
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 14 09:41:10 2020 +0100

    Fix BZ 64432. Refactoring broke multi-line rewrite rules
    
    Patch provided by Jj. Also includes previous 2 commits that revert the
    refactoring.
---
 test/org/apache/catalina/valves/rewrite/TestRewriteValve.java | 9 +++++++++
 webapps/docs/changelog.xml                                    | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
index 29c2961..134f45a 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
@@ -605,6 +605,15 @@ public class TestRewriteValve extends TomcatBaseTest {
         doTestRewrite("RewriteRule !^/c/.* /b/", "/c/d", "/c/d");
     }
 
+    @Test
+    public void testMultiLine001() throws Exception {
+        doTestRewrite("RewriteRule /dummy /anotherDummy [L]\nRewriteRule ^/a 
/c [L]", "/a", "/c");
+    }
+
+    @Test
+    public void testMultiLine002() throws Exception {
+        doTestRewrite("RewriteRule /dummy /a\nRewriteRule /a /c [L]", 
"/dummy", "/c");
+    }
 
     private void doTestRewrite(String config, String request, String 
expectedURI) throws Exception {
         doTestRewrite(config, request, expectedURI, null);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5e01706..c3330f0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 8.5.56 (markt)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>64432</bug>: Correct a refactoring regression that broke handling
+        of multi-line configuration in the RewriteValve. Patch provided by Jj.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <update>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org