Fix off-by-error causing first response header to be dropped.

Fix based on #710 by foremans.
apache · May 3, 2024 · cc70069 · cc70069
1 parent 792b496
commit cc70069
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1052,7 +1052,8 @@ protected final void prepareResponse() throws IOException {
                     size--;
                     // Header buffer is corrupted. Reset it and start again.
                     outputBuffer.resetHeaderBuffer();
-                    i = 0;
+                    // -1 as it will be incremented at the start of the loop and header indexes start at 0.
+                    i = -1;
                     outputBuffer.sendStatus();
                 }
             }

diff --git a/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java b/test/org/apache/coyote/http11/TestHttp11OutputBuffer.java
@@ -110,6 +110,7 @@ private void doTestHTTPHeaderValue(String customHeaderValue, boolean valid) thro
             Assert.assertEquals(HttpServletResponse.SC_OK, rc);
             List<String> values = resHeaders.get(HeaderServlet.CUSTOM_HEADER_NAME);
             Assert.assertNull(values);
+            Assert.assertEquals(5, resHeaders.size());
         }
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -155,7 +155,7 @@
       </fix>
       <fix>
         Remove MBean metadata for attibutes that have been removed. Based on
-        <pr>719</pr> by Shawn Q. (markt)
+        pull request <pr>719</pr> by Shawn Q. (markt)
       </fix>
       <scode>
         Remove duplicate ID check from <code>Manager.rotateSessionId()</code>.
@@ -206,6 +206,11 @@
       <scode>
         Refactor HTTP header parsing to use common parsing code. (markt)
       </scode>
+      <fix>
+        When an invalid HTTP response header was dropped, an off-by-one error
+        meant that the first header in the response was also dropped. Fix based
+        on pull request <pr>710</pr> by foremans. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
@@ -424,7 +429,7 @@
     <changelog>
       <fix>
         Minor performance improvement for building filter chains. Based on
-        ideas from <pr>702</pr> by Luke Miao. (remm)
+        ideas from pull request <pr>702</pr> by Luke Miao. (remm)
       </fix>
       <fix>
         Align error handling for <code>Writer</code> and