mmanders 2004/01/06 13:44:20
Modified: jk/native/common jk_ajp_common.c
Log:
Fixed logic when attempting to reuse connections in ajp_send_request. If the send
is successful, we needed to get out of the while loop. If the ping/pong or the
request failed, try and reuse without getting out of the loop.
Revision Changes Path
1.44 +6 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jk_ajp_common.c 5 Jan 2004 22:42:03 -0000 1.43
+++ jk_ajp_common.c 6 Jan 2004 21:44:20 -0000 1.44
@@ -1025,14 +1025,18 @@
err++;
}
+ /* If we got an error or can't send data, then try to get a pooled */
+ /* connection and try again. If we are succesful, break out of this */
+ /* loop. */
if (err || ajp_connection_tcp_send_message(ae, op->request, l) == JK_FALSE)
{
jk_log(l, JK_LOG_INFO,
"Error sending request try another pooled connection\n");
jk_close_socket(ae->sd);
ae->sd = -1;
ajp_reuse_connection(ae, l);
- break;
}
+ else
+ break;
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
