Author: mturk
Date: Sat Nov 25 00:37:11 2006
New Revision: 479107
URL: http://svn.apache.org/viewvc?view=rev&rev=479107
Log:
The cping/cpong is done inside ajp_connect_to_endpoint.
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?view=diff&rev=479107&r1=479106&r2=479107
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Nov 25
00:37:11 2006
@@ -1217,8 +1217,8 @@
if (err) {
/* XXX: If err is set, the tomcat is either dead or disconnected */
jk_log(l, JK_LOG_INFO,
- "(%s) all endpoints are disconnected or dead",
- ae->worker->name);
+ "(%s) all endpoints are %s",
+ ae->worker->name, err == 1 ? "disconnected" : "dead");
jk_log(l, JK_LOG_INFO,
"(%s) increase the backend idle connection timeout or the
connection_pool_minsize",
ae->worker->name);
@@ -1226,19 +1226,7 @@
/* Connect to the backend.
* This can be either uninitalized connection or a reconnect.
*/
- if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
- /* should we send a CPING to validate connection ? */
- if (ae->worker->connect_timeout > 0) {
- if (ajp_handle_cping_cpong(ae,
- ae->worker->connect_timeout, l) == JK_FALSE) {
- /* Close the socket if unable to cping/cpong */
- jk_close_socket(ae->sd);
- ae->sd = JK_INVALID_SOCKET;
- JK_TRACE_EXIT(l);
- return JK_FALSE;
- }
- }
-
+ if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
/*
* After we are connected, each error that we are going to
* have is probably unrecoverable
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
