hgomez 2004/08/31 01:33:24
Modified: jk/native/common jk_ajp_common.c
Log:
Fix Bugzilla#12404 and ensure that now is correctly initialized.
Patch provided by rainer.jung at kippdata.de
Revision Changes Path
1.58 +4 -6 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jk_ajp_common.c 9 Aug 2004 22:30:53 -0000 1.57
+++ jk_ajp_common.c 31 Aug 2004 08:33:24 -0000 1.58
@@ -1750,9 +1750,7 @@
if (rc) {
unsigned i;
time_t now;
- if (aw->socket_timeout > 0 || aw->cache_timeout) {
- now = time(NULL);
- }
+ now = time(NULL);
for (i = 0 ; i < aw->ep_cache_sz ; i++) {
if (aw->ep_cache[i]) {
ae = aw->ep_cache[i];
@@ -1768,7 +1766,7 @@
if (elapsed > aw->cache_timeout) {
jk_log(l, JK_LOG_DEBUG,
"In jk_endpoint_t::ajp_get_endpoint,"
- " cleaning cache slot = %d elapsed %d\n",
+ " cleaning cache slot = %d elapsed %u\n",
i, elapsed);
ajp_close_endpoint(aw->ep_cache[i], l);
aw->ep_cache[i] = NULL;
@@ -1784,7 +1782,7 @@
ae->last_access = now;
jk_log(l, JK_LOG_DEBUG,
"In jk_endpoint_t::ajp_get_endpoint, "
- "time elapsed since last request = %d seconds\n",
+ "time elapsed since last request = %u seconds\n",
elapsed);
if (aw->socket_timeout > 0 &&
elapsed > aw->socket_timeout) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
