Author: remm
Date: Tue Mar 1 09:45:27 2016
New Revision: 1733019
URL: http://svn.apache.org/viewvc?rev=1733019&view=rev
Log:
Fix incorrect parsing of the NE and NC flags in rewrite rules.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
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=1733019&r1=1733018&r2=1733019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue
Mar 1 09:45:27 2016
@@ -689,12 +689,12 @@ public class RewriteValve extends ValveB
rule.setHost(true);
} else if (flag.startsWith("last") || flag.startsWith("L")) {
rule.setLast(true);
- } else if (flag.startsWith("next") || flag.startsWith("N")) {
- rule.setNext(true);
} else if (flag.startsWith("nocase") || flag.startsWith("NC")) {
rule.setNocase(true);
} else if (flag.startsWith("noescape") || flag.startsWith("NE")) {
rule.setNoescape(true);
+ } else if (flag.startsWith("next") || flag.startsWith("N")) {
+ rule.setNext(true);
// FIXME: Proxy not supported, would require proxy capabilities in
Tomcat
/* } else if (flag.startsWith("proxy") || flag.startsWith("P")) {
rule.setProxy(true);*/
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1733019&r1=1733018&r2=1733019&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 1 09:45:27 2016
@@ -129,6 +129,9 @@
<fix>
Add socket properties support to storeconfig. (remm)
</fix>
+ <fix>
+ Fix incorrect parsing of the NE and NC flags in rewrite rules. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
