63002: Fix rewrite qsdiscard flag

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1848670 13f79535-47bb-0310-9956-ffa450edef68
rjozwik · Dec 11, 2018 · 1200aaf · 1200aaf
1 parent 8f391af
commit 1200aaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -725,7 +725,7 @@ protected static void parseRuleFlag(String line, RewriteRule rule, String flag)
         } else if (flag.startsWith("qsappend") || flag.startsWith("QSA")) {
             rule.setQsappend(true);
         } else if (flag.startsWith("qsdiscard") || flag.startsWith("QSD")) {
-            rule.setQsappend(true);
+            rule.setQsdiscard(true);
         } else if (flag.startsWith("redirect") || flag.startsWith("R")) {
             rule.setRedirect(true);
             int redirectCode = HttpServletResponse.SC_FOUND;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -45,6 +45,13 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.15 (markt)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>63002</bug>: Fix setting rewrite qsdiscard flag. (remm)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.14 (markt)" rtext="release in progress">
   <subsection name="Catalina">