svn commit: r1759514 - in /tomcat/trunk/java/org/apache/catalina/valves/rewrite: RewriteRule.java RewriteValve.java

[markt]

Author: markt
Date: Tue Sep  6 21:26:07 2016
New Revision: 1759514

URL: http://svn.apache.org/viewvc?rev=1759514&view=rev
Log:
Add configuration support (but no implementation) for 'B' flag (escape
backreferences)

Modified:
    tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
    tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java?rev=1759514&r1=1759513&r2=1759514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java Tue 
Sep  6 21:26:07 2016
@@ -151,6 +151,8 @@ public class RewriteRule {
     }
 
 
+    private boolean escapeBackreferences = false;
+
     /**
      *  This flag chains the current rule with the next rule (which itself
      *  can be chained with the following rule, etc.). This has the following
@@ -325,6 +327,13 @@ public class RewriteRule {
      */
     protected boolean type = false;
     protected String typeValue = null;
+
+    public boolean isEscapeBackreferences() {
+        return escapeBackreferences;
+    }
+    public void setEscapeBackreferences(boolean escapeBackreferences) {
+        this.escapeBackreferences = escapeBackreferences;
+    }
     public boolean isChain() {
         return chain;
     }

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1759514&r1=1759513&r2=1759514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue 
Sep  6 21:26:07 2016
@@ -663,7 +663,9 @@ public class RewriteValve extends ValveB
      * @param flag The flag
      */
     protected static void parseRuleFlag(String line, RewriteRule rule, String 
flag) {
-        if (flag.equals("chain") || flag.equals("C")) {
+        if (flag.equals("B")) {
+            rule.setEscapeBackreferences(true);
+        } else if (flag.equals("chain") || flag.equals("C")) {
             rule.setChain(true);
         } else if (flag.startsWith("cookie=") || flag.startsWith("CO=")) {
             rule.setCookie(true);



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