Update RewriteValve to use dotall mode

Author: markt-asf

java/org/apache/catalina/valves/rewrite/RewriteCond.java

@@ -151,7 +151,7 @@ public void parse(Map<String, RewriteMap> maps) {
             this.condition = ncondition;
         } else {
             PatternCondition ncondition = new PatternCondition();
-            int flags = 0;
+            int flags = Pattern.DOTALL;
             if (isNocase()) {
                 flags |= Pattern.CASE_INSENSITIVE;
             }

java/org/apache/catalina/valves/rewrite/RewriteRule.java

@@ -47,7 +47,7 @@ public void parse(Map<String, RewriteMap> maps) {
             positive = false;
             patternString = patternString.substring(1);
         }
-        int flags = 0;
+        int flags = Pattern.DOTALL;
         if (isNocase()) {
             flags |= Pattern.CASE_INSENSITIVE;
         }
@@ -89,7 +89,7 @@ public CharSequence evaluate(CharSequence url, Resolver resolver) {
         Pattern pattern = this.pattern.get();
         if (pattern == null) {
             // Parse the pattern
-            int flags = 0;
+            int flags = Pattern.DOTALL;
             if (isNocase()) {
                 flags |= Pattern.CASE_INSENSITIVE;
             }

webapps/docs/changelog.xml

@@ -147,6 +147,11 @@
         <code>ErrorReportValve</code> that returns  response as JSON instead of
         HTML. Back-porting kfujino's implementation. (lihan)
       </add>
+      <fix>
+        Update the <code>RewriteValve</code> to perform pattern matching using
+        dotall mode to avoid unexpected behaviour if the URL includes encoded
+        line terminators. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">