You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2013/12/08 21:11:13 UTC

svn commit: r1549202 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml

Author: rjung
Date: Sun Dec  8 20:11:13 2013
New Revision: 1549202

URL: http://svn.apache.org/r1549202
Log:
PR 55853: HTTPD: Use the correct API for setting
Content-Length.

Modified:
    tomcat/jk/trunk/native/apache-1.3/mod_jk.c
    tomcat/jk/trunk/native/apache-2.0/mod_jk.c
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1549202&r1=1549201&r2=1549202&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Dec  8 20:11:13 2013
@@ -365,8 +365,7 @@ static int JK_METHOD ws_start_response(j
                              header_values[h]);
             }
             else if (!strcasecmp(header_names[h], "Content-Length")) {
-                ap_table_set(r->headers_out, header_names[h],
-                             header_values[h]);
+                ap_set_content_length(r, atol(header_values[h]));
             }
             else if (!strcasecmp(header_names[h], "Transfer-Encoding")) {
                 ap_table_set(r->headers_out, header_names[h],

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1549202&r1=1549201&r2=1549202&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sun Dec  8 20:11:13 2013
@@ -392,7 +392,7 @@ static int JK_METHOD ws_start_response(j
             apr_table_set(r->headers_out, header_names[h], header_values[h]);
         }
         else if (!strcasecmp(header_names[h], "Content-Length")) {
-            apr_table_set(r->headers_out, header_names[h], header_values[h]);
+            ap_set_content_length(r, apr_atoi64(header_values[h]));
         }
         else if (!strcasecmp(header_names[h], "Transfer-Encoding")) {
             apr_table_set(r->headers_out, header_names[h], header_values[h]);

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1549202&r1=1549201&r2=1549202&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Dec  8 20:11:13 2013
@@ -47,6 +47,10 @@
       <fix>
         Fix status worker not updating parameters for all members. (mturk)
       </fix>
+      <fix>
+        <bug>55853</bug>: HTTPD: Use the correct API for setting Content-Length.
+        Patch contributed by areese yahoo-inc.com. (rjung)
+      </fix>
       <add>
         Add --disable-sock-cloexec to configure to disable use of SOCK_CLOEXEC
         (using FD_CLOEXEC + fnctl instead) so built modules will work with



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org