Author: mturk
Date: Sat Jul 8 01:01:16 2006
New Revision: 420084
URL: http://svn.apache.org/viewvc?rev=420084&view=rev
Log:
Revert the previous patch for reconnect if all the
endpoints are disconnected. Depend on the service retries
parameter for that.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=420084&r1=420083&r2=420084&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Jul 8
01:01:16 2006
@@ -1218,11 +1218,7 @@
* If we failed to reuse a connection, try to reconnect.
*/
if (ae->sd < 0) {
- /* If we the previous connection was in error
- * try to reconnect only if timeouts are set
- */
- if (err && ae->worker->connect_timeout == 0 &&
- ae->worker->socket_timeout == 0) {
+ if (err) {
/* XXX: If err is set, the tomcat is either dead or disconnected */
jk_log(l, JK_LOG_INFO,
"All endpoints are disconnected or dead");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
