Author: mturk
Date: Thu Oct 23 23:16:19 2008
New Revision: 707557
URL: http://svn.apache.org/viewvc?rev=707557&view=rev
Log:
Use correct ping_interval calculation
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=707557&r1=707556&r2=707557&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Oct 23
23:16:19 2008
@@ -2571,9 +2571,14 @@
p->conn_ping_interval =
jk_get_worker_conn_ping_interval(props, p->name, 0);
if ((p->ping_mode & AJP_CPING_INTERVAL) &&
- p->conn_ping_interval == 0)
- p->conn_ping_interval = p->ping_timeout / 10;
-
+ p->conn_ping_interval == 0) {
+ /* XXX: Ping timeot is in miliseconds
+ * and ping_interval is in seconds.
+ * Use 10 times larger value fo ping interval
+ * (ping_timeout / 1000) * 10
+ */
+ p->conn_ping_interval = p->ping_timeout / 100;
+ }
p->reply_timeout =
jk_get_worker_reply_timeout(props, p->name,
AJP_DEF_REPLY_TIMEOUT);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
