This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 511b15561e Recycle Parameters.queryStringCharset between requests
511b15561e is described below
commit 511b15561ed8f9fde41bd7e9dbf43eb517e703a1
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 29 14:01:17 2026 +0100
Recycle Parameters.queryStringCharset between requests
Issue raised on users list. Only likely to be a problem if a custom
Valve is changing queryStringCharset on a per request basis.
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++++--
java/org/apache/tomcat/util/http/Parameters.java | 5 +++++
webapps/docs/changelog.xml | 5 +++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 8e23986655..4c2cff5fa7 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -320,9 +320,12 @@ public class CoyoteAdapter implements Adapter {
req.setNote(ADAPTER_NOTES, request);
res.setNote(ADAPTER_NOTES, response);
- // Set query string encoding
-
req.getParameters().setQueryStringCharset(connector.getURICharset());
}
+ /*
+ * Set query string encoding on every request in case the previous
request changed it. It cannot be reset in
+ * Parameters.recyle() as Parameters does not have access to the
Connector to obtain the default.
+ */
+ req.getParameters().setQueryStringCharset(connector.getURICharset());
if (connector.getXpoweredBy()) {
response.addHeader("X-Powered-By", POWERED_BY);
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index a01666f5b6..984fd01b36 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -142,6 +142,11 @@ public final class Parameters {
didQueryParameters = false;
charset = DEFAULT_BODY_CHARSET;
decodedQuery.recycle();
+ /*
+ * queryStringCharset cannot be recycled here as it needs to be set to
Connector.getURICharset() which is not
+ * accessible from Parameters. queryStringCharset is therefore reset
at the start of every request in
+ * CoyoteAdpater.service().
+ */
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 49f6f8d30c..b92d0383f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -319,6 +319,11 @@
returns <code>on</code> or <code>off</code> rather than
<code>true</code> or <code>false</code> to align with httpd. (markt)
</fix>
+ <fix>
+ Reset the encoding used for query string parameters between requests in
+ case an application changed changed the encoding in a previous request.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
