Author: rjung
Date: Wed Apr 9 17:26:13 2014
New Revision: 1586044
URL: http://svn.apache.org/r1586044
Log:
Fix forwarding of chunked requests, which is
broken in version 1.2.37.
Bug was introduced by refactoring in r1555413.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1586044&r1=1586043&r2=1586044&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Apr 9 17:26:13 2014
@@ -1482,7 +1482,7 @@ static int ajp_read_into_msg_buff(ajp_en
if ((r->is_chunked && len == 0) || len < 0 || len > maxlen) {
len = maxlen;
}
- if ((jk_uint64_t)len > ae->left_bytes_to_send) {
+ if (ae->left_bytes_to_send > 0 && (jk_uint64_t)len >
ae->left_bytes_to_send) {
len = (int)ae->left_bytes_to_send;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1586044&r1=1586043&r2=1586044&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Apr 9 17:26:13 2014
@@ -45,6 +45,10 @@
<subsection name="Native">
<changelog>
<fix>
+ Fix forwarding of chunked requests, which is broken in version 1.2.39.
+ (rjung)
+ </fix>
+ <fix>
<bug>56352</bug>: Fix regression in memory release. (mturk)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
