This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 61a8016a9c Fix evaluation order in the old code
61a8016a9c is described below
commit 61a8016a9c6083180ab8fa51de570037aa626c95
Author: remm <[email protected]>
AuthorDate: Thu Dec 12 10:42:06 2024 +0100
Fix evaluation order in the old code
Format to make the order more visible.
Test submitted by Chenjp.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 6 ++++--
.../servlets/TestDefaultServletRfc9110Section13Parameterized.java | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 42f2a9565c..f3edd1745f 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -739,8 +739,10 @@ public class DefaultServlet extends HttpServlet {
*/
protected boolean checkIfHeaders(HttpServletRequest request,
HttpServletResponse response, WebResource resource)
throws IOException {
- return checkIfMatch(request, response, resource) &&
checkIfModifiedSince(request, response, resource) &&
- checkIfNoneMatch(request, response, resource) &&
checkIfUnmodifiedSince(request, response, resource);
+ return checkIfMatch(request, response, resource)
+ && checkIfUnmodifiedSince(request, response, resource)
+ && checkIfNoneMatch(request, response, resource)
+ && checkIfModifiedSince(request, response, resource);
}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
index 7388a97675..238a27d91b 100644
---
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
+++
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
@@ -104,6 +104,8 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
Boolean.FALSE, null, new int[] { 200 } });
parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_MULTI_IN, null, null,
null, Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_LT, null, IfPolicy.DATE_GT,
+ null, Boolean.FALSE, null, new int[] { 412 } });
parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_EQ, null, null, null,
Boolean.FALSE, null, new int[] { 200 } });
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
