(tomcat) branch main updated: Fix evaluation order in the old code

[remm]

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 6ad86d811e Fix evaluation order in the old code
6ad86d811e is described below

commit 6ad86d811eba1856fd1dd02e25bbe53adb616f14
Author: remm <r...@apache.org>
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 ceaca1d164..fa9cf5366f 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -726,8 +726,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 e9cbb3fee7..64e33f75b8 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org