Author: rjung
Date: Fri Oct 3 12:22:52 2008
New Revision: 701498
URL: http://svn.apache.org/viewvc?rev=701498&view=rev
Log:
- Allow ping_mode = 'a' (for al)
- Check ping_mode for AJP_CPING_INTERVAL instead of
AJP_CPING_PREPOST when setting conn_ping_interval.
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=701498&r1=701497&r2=701498&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Oct 3
12:22:52 2008
@@ -374,6 +374,10 @@
mv |= AJP_CPING_PREPOST;
else if (*m == 'I' || *m == 'i')
mv |= AJP_CPING_INTERVAL;
+ else if (*m == 'A' || *m == 'a') {
+ mv = AJP_CPING_CONNECT | AJP_CPING_PREPOST | AJP_CPING_INTERVAL;
+ break;
+ }
m++;
}
return mv;
@@ -1005,7 +1009,7 @@
* @param msg message to send
* @param l logger
* @return JK_FATAL_ERROR: endpoint contains unknown protocol
- * JK_FALSE: other failure
+ * JK_FALSE: other failure
* JK_TRUE: success
* @remark Always closes socket in case of
* a socket error, or JK_FATAL_ERROR
@@ -1066,7 +1070,7 @@
* @param ae endpoint
* @param msg message to send
* @param l logger
- * @return JK_FALSE: failure
+ * @return JK_FALSE: failure
* JK_TRUE: success
* @remark Always closes socket in case of
* a socket error
@@ -2504,7 +2508,7 @@
p->ping_mode =
jk_get_worker_ping_mode(props, p->name,
AJP_CPING_NONE);
-
+
p->connect_timeout =
jk_get_worker_connect_timeout(props, p->name,
AJP_DEF_CONNECT_TIMEOUT);
@@ -2512,6 +2516,7 @@
p->prepost_timeout =
jk_get_worker_prepost_timeout(props, p->name,
AJP_DEF_PREPOST_TIMEOUT);
+
if ((p->ping_mode & AJP_CPING_CONNECT) &&
p->connect_timeout == AJP_DEF_CONNECT_TIMEOUT)
p->connect_timeout = p->ping_timeout;
@@ -2522,7 +2527,7 @@
p->conn_ping_interval =
jk_get_worker_conn_ping_interval(props, p->name, 0);
- if ((p->ping_mode & AJP_CPING_PREPOST) &&
+ if ((p->ping_mode & AJP_CPING_INTERVAL) &&
p->conn_ping_interval == 0)
p->conn_ping_interval = p->ping_timeout / 10;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
