Author: markt
Date: Thu Sep 22 12:56:22 2016
New Revision: 1761953
URL: http://svn.apache.org/viewvc?rev=1761953&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57485
Apache: Propagate errors reading the request body from the client to mod_jk so
Tomcat sees an error rather than a truncated body.
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=1761953&r1=1761952&r2=1761953&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Thu Sep 22 12:56:22 2016
@@ -428,7 +428,7 @@ static int JK_METHOD ws_read(jk_ws_servi
if (p->read_body_started) {
long rv;
if ((rv = ap_get_client_block(p->r, b, len)) < 0) {
- *actually_read = 0;
+ return JK_FALSE;
}
else {
*actually_read = (unsigned)rv;
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=1761953&r1=1761952&r2=1761953&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Thu Sep 22 12:56:22 2016
@@ -463,7 +463,7 @@ static int JK_METHOD ws_read(jk_ws_servi
#endif
if ((rv = ap_get_client_block(p->r, b, len)) < 0) {
- *actually_read = 0;
+ return JK_FALSE;
}
else {
*actually_read = (unsigned)rv;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761953&r1=1761952&r2=1761953&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Sep 22 12:56:22 2016
@@ -55,6 +55,11 @@
failed during earlier processing phases. (rjung)
</fix>
<fix>
+ <bug>57485</bug>: Apache: Propagate errors reading the request body
from
+ the client to mod_jk so Tomcat sees an error rather than a truncated
+ body. (markt)
+ </fix>
+ <fix>
<bug>57836</bug>: ISAPI: Empty REMOTE_USER should not be
translated to "". (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
