This is an automated email from the ASF dual-hosted git repository.
markt 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 35121eda45 Fix case sensitivity issues in trailer header allow list
35121eda45 is described below
commit 35121eda450de791db9f1649ecf86429658c0966
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Sep 24 18:15:58 2025 +0100
Fix case sensitivity issues in trailer header allow list
Found by TCK failure
---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 2 +-
java/org/apache/tomcat/util/http/MimeHeaders.java | 3 ++-
webapps/docs/changelog.xml | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index 86b6c884be..0b876e6543 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -500,7 +500,7 @@ public abstract class AbstractHttp11Protocol<S> extends
AbstractProtocol<S> {
}
public boolean isTrailerHeaderAllowed(String headerName) {
- return allowedTrailerHeaders.contains(headerName);
+ return
allowedTrailerHeaders.contains(headerName.trim().toLowerCase(Locale.ENGLISH));
}
public String getAllowedTrailerHeaders() {
diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 16f65cb86a..dcad6dedc5 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -22,6 +22,7 @@ import java.io.StringWriter;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -159,7 +160,7 @@ public class MimeHeaders {
int j = -1;
for (int i = 0; i < count; i++) {
String name = headers[i].getName().toStringType();
- if (allowedHeaders.contains(name)) {
+ if
(allowedHeaders.contains(name.trim().toLowerCase(Locale.ENGLISH))) {
++j;
if (j != i) {
headers[j] = headers[i];
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 51d4fd6817..1f4b9dc9e2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -193,6 +193,9 @@
Refactor access log time stamps to be based on the <code>Instant</code>
request processing starts. (markt)
</scode>
+ <fix>
+ Fix a case-sensitivity issue in the trailer header allow list. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
