Author: rjung
Date: Thu Feb 13 13:49:09 2014
New Revision: 1567917
URL: http://svn.apache.org/r1567917
Log:
BZ 56133: Fix possible crash when a request fails during
request body transfer to the back end and reply_timeout was set.
Patch contributed by Hiroto Shimizu. (rjung)
--This lene, and those below, will be ignored--
M native/common/jk_ajp_common.c
M xdocs/miscellaneous/changelog.xml
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=1567917&r1=1567916&r2=1567917&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Thu Feb 13 13:49:09 2014
@@ -2267,7 +2267,7 @@ static int ajp_get_reply(jk_endpoint_t *
*/
op->recoverable = JK_FALSE;
rc = ajp_connection_tcp_send_message(p, op->post, l);
- if (rc < 0) {
+ if (rc != JK_TRUE) {
jk_log(l, JK_LOG_ERROR,
"(%s) Tomcat is down or network problems",
p->worker->name);
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1567917&r1=1567916&r2=1567917&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Feb 13 13:49:09 2014
@@ -45,6 +45,11 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>56133</bug>: Fix possible crash when a request fails during
+ request body transfer to the back end and reply_timeout was set.
+ Patch contributed by Hiroto Shimizu. (rjung)
+ </fix>
+ <fix>
Fix status worker not updating parameters for all members. (mturk)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
