mturk 2005/02/14 10:07:00
Modified: jk/native/common jk_ajp_common.c
jk/xdocs changelog.xml
Log:
Fix #33562. Not very common case, but fixes the situation when remote
breaks when the headers has been send already.
Revision Changes Path
1.77 +10 -2
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- jk_ajp_common.c 14 Feb 2005 17:25:24 -0000 1.76
+++ jk_ajp_common.c 14 Feb 2005 18:07:00 -0000 1.77
@@ -1420,8 +1420,16 @@
if (ajp_is_input_event(p, p->worker->reply_timeout, l) ==
JK_FALSE) {
jk_log(l, JK_LOG_ERROR,
- "Timeout will waiting reply from tomcat. "
+ "Timeout with waiting reply from tomcat. "
"Tomcat is down, stopped or network problems.");
+ if (headeratclient == JK_FALSE) {
+ if (p->worker->recovery_opts &
RECOVER_ABORT_IF_TCGETREQUEST)
+ op->recoverable = JK_FALSE;
+ }
+ else {
+ if (p->worker->recovery_opts &
RECOVER_ABORT_IF_TCSENDHEADER)
+ op->recoverable = JK_FALSE;
+ }
JK_TRACE_EXIT(l);
return JK_FALSE;
1.11 +4 -0 jakarta-tomcat-connectors/jk/xdocs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- changelog.xml 13 Feb 2005 13:22:50 -0000 1.10
+++ changelog.xml 14 Feb 2005 18:07:00 -0000 1.11
@@ -26,6 +26,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>33562</bug>: Fix Reply_timeout when recovery_options
+ is larger than 1. Patch provided by Takashi Satou. (mturk)
+ </fix>
+ <fix>
<bug>33308</bug>: Fix segfaults when ForwardDirectories is enabled
with Apache 1.3
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
