Author: markt
Date: Tue Jan 16 22:28:51 2018
New Revision: 1821328

URL: http://svn.apache.org/viewvc?rev=1821328&view=rev
Log:
Correct a regression in the previous fix for BZ 61916 that meant that any call 
to addHeader() would have been replaced with a call to setHeader() for all 
requests mapped to the AddDefaultCharsetFilter.

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1821328&r1=1821327&r2=1821328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
Tue Jan 16 22:28:51 2018
@@ -134,7 +134,7 @@ public class AddDefaultCharsetFilter ext
             if (name.trim().equalsIgnoreCase("content-type")) {
                 setContentType(value);
             } else {
-                super.setHeader(name, value);
+                super.addHeader(name, value);
             }
         }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1821328&r1=1821327&r2=1821328&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 16 22:28:51 2018
@@ -48,6 +48,12 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        Correct a regression in the previous fix for <bug>61916</bug> that 
meant
+        that any call to <code>addHeader()</code> would have been replaced with
+        a call to <code>setHeader()</code> for all requests mapped to the
+        <code>AddDefaultCharsetFilter</code>. (markt)
+      </fix>
+      <fix>
         <bug>61999</bug>: maxSavePostSize set to 0 should disable saving POST
         data during authentication. (remm)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to