truk 2004/03/12 12:42:51
Modified: jk/native2/common jk_worker_ajp13.c
Log:
Don't do a prepost check alive if the endpoint is not connected yet (it
always fails). When connecting endpoint do a prepost check alive if
there isn't a connect check alive.
Revision Changes Path
1.62 +5 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- jk_worker_ajp13.c 1 Mar 2004 09:35:26 -0000 1.61
+++ jk_worker_ajp13.c 12 Mar 2004 20:42:51 -0000 1.62
@@ -303,9 +303,12 @@
/** XXX use a 'connected' field */
if( ae->sd == -1 ) ae->sd=0;
- if (ae->worker->connect_timeout != 0 ) {
+ if (ae->worker->connect_timeout != 0) {
if (jk2_check_alive(env, ae, ae->worker->connect_timeout) != JK_OK)
return JK_ERR;
+ } else if (ae->worker->prepost_timeout != 0) {
+ if (jk2_check_alive(env, ae, ae->worker->prepost_timeout) != JK_OK)
+ return JK_ERR;
}
/* Check if we must execute a logon after the physical connect */
@@ -569,7 +572,7 @@
s->left_bytes_to_send = s->content_length;
s->content_read=0;
- if (w->prepost_timeout != 0) {
+ if (w->prepost_timeout != 0 && e->sd != -1) {
if (jk2_check_alive(env, e, e->worker->prepost_timeout) != JK_OK)
return JK_ERR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
