Fix inconsistencies with special headers and getHeader

Handling of Content-Type and Content-Length with getHeader,
getHeaderNames and getHeaders.
BZ69967

Author: rmaucher

java/org/apache/catalina/connector/Response.java

@@ -747,6 +747,23 @@ public void setLocale(Locale locale) {
 
     @Override
     public String getHeader(String name) {
+        // Need special handling for Content-Type and Content-Length due to
+        // special handling of these in coyoteResponse
+        char cc = name.charAt(0);
+        if (cc == 'C' || cc == 'c') {
+            if (name.equalsIgnoreCase("Content-Type")) {
+                // Will return null if this has not been set
+                return getCoyoteResponse().getContentType();
+            }
+            if (name.equalsIgnoreCase("Content-Length")) {
+                // -1 means not known and is not sent to client
+                if (getCoyoteResponse().getContentLengthLong() != -1) {
+                    return String.valueOf(getCoyoteResponse().getContentLengthLong());
+                } else {
+                    return null;
+                }
+            }
+        }
         return getCoyoteResponse().getMimeHeaders().getHeader(name);
     }
 
@@ -759,13 +776,40 @@ public Collection<String> getHeaderNames() {
         for (int i = 0; i < n; i++) {
             result.add(headers.getName(i).toString());
         }
+        if (getCoyoteResponse().getContentType() != null) {
+            result.add("Content-Type");
+        }
+        if (getCoyoteResponse().getContentLengthLong() != -1) {
+            result.add("Content-Length");
+        }
         return result;
-
     }
 
 
     @Override
     public Collection<String> getHeaders(String name) {
+        // Need special handling for Content-Type and Content-Length due to
+        // special handling of these in coyoteResponse
+        char cc = name.charAt(0);
+        if (cc == 'C' || cc == 'c') {
+            if (name.equalsIgnoreCase("Content-Type")) {
+                // Will return null if this has not been set
+                String contentType = getCoyoteResponse().getContentType();
+                if (contentType != null) {
+                    return Set.of(contentType);
+                } else {
+                    return Set.of();
+                }
+            }
+            if (name.equalsIgnoreCase("Content-Length")) {
+                // -1 means not known and is not sent to client
+                if (getCoyoteResponse().getContentLengthLong() != -1) {
+                    return Set.of(String.valueOf(getCoyoteResponse().getContentLengthLong()));
+                } else {
+                    return Set.of();
+                }
+            }
+        }
         Enumeration<String> enumeration = getCoyoteResponse().getMimeHeaders().values(name);
         Set<String> result = new LinkedHashSet<>();
         while (enumeration.hasMoreElements()) {

test/org/apache/catalina/connector/TestResponse.java

@@ -736,6 +736,24 @@ public void testSetCharacterEncoding08() {
     }
 
 
+    @Test
+    public void testSetContentLengthHeader() {
+        Response response = setupResponse();
+
+        response.setContentLength(10);
+        Assert.assertEquals("10", response.getHeader("Content-Length"));
+    }
+
+
+    @Test
+    public void testSetContentTypeHeader() {
+        Response response = setupResponse();
+
+        response.setContentType(TEXT_UTF_8);
+        Assert.assertEquals(TEXT_UTF_8, response.getHeader("Content-Type"));
+    }
+
+
     @Test
     public void testSetContentType01() {
         Response response = setupResponse();

webapps/docs/changelog.xml

@@ -191,6 +191,11 @@
         to <code>true</code>. (markt)
       </update>
       <!-- Entries for backport and removal before 12.0.0-M1 below this line -->
+      <fix>
+        <bug>69967</bug>: Fix inconsistencies related to
+        <code>Content-Length</code> and <code>Content-Type</code> headers when
+        accessed using the <code>getHeader</code> method and similar. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">