Author: mturk
Date: Mon Dec 21 11:46:29 2009
New Revision: 892776
URL: http://svn.apache.org/viewvc?rev=892776&view=rev
Log:
Fix #47222. Add ping_timeout to the shared memory
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_shm.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=892776&r1=892775&r2=892776&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 21 11:46:29 2009
@@ -1009,6 +1009,7 @@
aw->cache_timeout = aw->s->cache_timeout;
aw->connect_timeout = aw->s->connect_timeout;
+ aw->ping_timeout = aw->s->ping_timeout;
aw->reply_timeout = aw->s->reply_timeout;
aw->prepost_timeout = aw->s->prepost_timeout;
aw->recovery_opts = aw->s->recovery_opts;
@@ -1056,6 +1057,7 @@
aw->s->cache_timeout = aw->cache_timeout;
aw->s->connect_timeout = aw->connect_timeout;
+ aw->s->ping_timeout = aw->ping_timeout;
aw->s->reply_timeout = aw->reply_timeout;
aw->s->prepost_timeout = aw->prepost_timeout;
aw->s->recovery_opts = aw->recovery_opts;
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=892776&r1=892775&r2=892776&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Mon Dec 21 11:46:29 2009
@@ -85,6 +85,7 @@
/* Configuration data mirrored from ajp_worker */
int cache_timeout;
int connect_timeout;
+ int ping_timeout;
int reply_timeout;
int prepost_timeout;
unsigned int recovery_opts;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892776&r1=892775&r2=892776&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 11:46:29 2009
@@ -44,6 +44,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>47222</bug>: Status: Add ping_timeout to the shared memory
+ and allow dynamic configuration. (mturk)
+ </fix>
+ <fix>
<bug>46632</bug>: Httpd: Do not register child cleanup with
none of our pools. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
