mturk 2004/12/12 23:39:51
Modified: jk/native/common jk_ajp_common.c
Log:
Fix the bug initializing ajp. The worker will not initialize if cache_size
was set to zero.
Revision Changes Path
1.66 +7 -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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- jk_ajp_common.c 26 Nov 2004 16:59:51 -0000 1.65
+++ jk_ajp_common.c 13 Dec 2004 07:39:51 -0000 1.66
@@ -1666,7 +1666,7 @@
jk_map_t *props, jk_worker_env_t *we, jk_logger_t *l, int proto)
{
int cache;
-
+ int rc = JK_FALSE;
/*
* start the connection cache
*/
@@ -1682,7 +1682,7 @@
jk_log(l, JK_LOG_ERROR,
"unknown protocol %d\n", proto);
JK_TRACE_EXIT(l);
- return JK_FALSE;
+ return rc;
}
if (pThis && pThis->worker_private) {
@@ -1782,19 +1782,20 @@
p->ep_cache[i] = NULL;
}
JK_INIT_CS(&(p->cs), i);
- if (i) {
+ if (i == JK_FALSE) {
JK_TRACE_EXIT(l);
- return JK_TRUE;
+ return JK_FALSE;
}
}
}
+ rc = JK_TRUE;
}
else {
JK_LOG_NULL_PARAMS(l);
}
JK_TRACE_EXIT(l);
- return JK_FALSE;
+ return rc;
}
int ajp_destroy(jk_worker_t **pThis, jk_logger_t *l, int proto)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
