This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 0a3ea7a40b Fix bad processing for qsd flag
0a3ea7a40b is described below
commit 0a3ea7a40be8ea433c9df788ade3f6de4ee13d1b
Author: remm <r...@apache.org>
AuthorDate: Wed Sep 13 17:19:57 2023 +0200
Fix bad processing for qsd flag
It needs to override qsa, not the opposite.
---
java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index d9c60b8430..b3b1b35669 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -356,7 +356,7 @@ public class RewriteValve extends ValveBase {
qsa = true;
}
- if (!qsa && newtest != null && rule.isQsdiscard()) {
+ if (!qsd && newtest != null && rule.isQsdiscard()) {
qsd = true;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 664ed4ff92..4b796c95ae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Fix handling of an error reading a context descriptor on deployment.
(remm)
</fix>
+ <fix>
+ Fix rewrite rule qsd (query string discard) being ignored if qsa was
+ also use, while it should instead take precedence. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
