This is an automated email from the ASF dual-hosted git repository.
remm 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 6a234187ea Fix edge case
6a234187ea is described below
commit 6a234187eac495e564d69f2b2f9bfd07dd998a22
Author: remm <[email protected]>
AuthorDate: Wed Dec 11 12:05:34 2024 +0100
Fix edge case
---
java/org/apache/catalina/servlets/DefaultServlet.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 8eb1ba8524..e93a16123d 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2144,7 +2144,9 @@ public class DefaultServlet extends HttpServlet {
return true;
}
boolean hasAsteriskValue = false;// check existence of special header
value '*'
+ int headerCount = 0;
while (headerValues.hasMoreElements() && !conditionSatisfied) {
+ headerCount++;
String headerValue = headerValues.nextElement();
if ("*".equals(headerValue)) {
hasAsteriskValue = true;
@@ -2163,7 +2165,11 @@ public class DefaultServlet extends HttpServlet {
}
}
}
- if (hasAsteriskValue && headerValues.hasMoreElements()) {
+ if (headerValues.hasMoreElements()) {
+ headerCount++;
+ }
+
+ if (hasAsteriskValue && headerCount > 1) {
// Note that an If-Match header field with a list value containing
"*" and other values (including other
// instances of "*") is syntactically invalid (therefore not
allowed to be generated) and furthermore is
// unlikely to be interoperable.
@@ -2238,13 +2244,14 @@ public class DefaultServlet extends HttpServlet {
}
boolean hasAsteriskValue = false;// check existence of special header
value '*'
boolean conditionSatisfied = true;
+ int headerCount = 0;
while (headerValues.hasMoreElements()) {
-
+ headerCount++;
String headerValue = headerValues.nextElement();
if (headerValue.equals("*")) {
hasAsteriskValue = true;
- if (headerValues.hasMoreElements()) {
+ if (headerCount > 1 || headerValues.hasMoreElements()) {
conditionSatisfied = false;
break;
} else {
@@ -2284,8 +2291,11 @@ public class DefaultServlet extends HttpServlet {
}
}
+ if (headerValues.hasMoreElements()) {
+ headerCount++;
+ }
- if (hasAsteriskValue && headerValues.hasMoreElements()) {
+ if (hasAsteriskValue && headerCount > 1) {
// Note that an If-None-Match header field with a list value
containing "*" and other values (including
// other instances of "*") is syntactically invalid (therefore not
allowed to be generated) and furthermore
// is unlikely to be interoperable.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
