This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 11be2fec9184b0b9b6b7f4addac7e396b4b56498 Author: opencode <[email protected]> AuthorDate: Wed Sep 30 16:14:38 2026 +0200 Ignore a null charset in the AddDefaultCharsetFilter response wrapper rather than storing it and later appending a literal charset=null parameter to the Content-Type header --- java/org/apache/catalina/filters/AddDefaultCharsetFilter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java index e2e6ac4ccd..9c70623cc0 100644 --- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java +++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java @@ -148,7 +148,9 @@ public class AddDefaultCharsetFilter extends FilterBase { @Override public void setCharacterEncoding(String charset) { super.setCharacterEncoding(charset); - encoding = charset; + if (charset != null) { + encoding = charset; + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
