mturk 2004/03/15 03:59:01
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Removed the childGeneration checking.
Since the childId uses pid instead scoreboard slot that cored the server.
Revision Changes Path
1.78 +5 -21 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mod_jk2.c 13 Mar 2004 08:49:26 -0000 1.77
+++ mod_jk2.c 15 Mar 2004 11:59:01 -0000 1.78
@@ -472,9 +472,10 @@
jk_workerEnv_t *workerEnv, server_rec *s )
{
+ ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &workerEnv->maxDaemons);
+
workerEnv->init(env, workerEnv );
workerEnv->server_name = (char *)ap_get_server_version();
- ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &workerEnv->maxDaemons);
/* Should be done in post config instead (cf DAV2) */
/* ap_add_version_component(pconf, JK_EXPOSED_VERSION); */
@@ -609,33 +610,16 @@
"jk2_init() Found child %d in scoreboard slot %d\n",
proc.pid, workerEnv->childId);
}
- /* If the child slot was found in the scoreboard, increment the
- * generation status. This will prevent initializing jk2 if something
- * goes wrong.
- */
- if (workerEnv->childId >= 0) {
- workerEnv->childGeneration =
ap_scoreboard_image->parent[workerEnv->childId].generation;
- ++ap_scoreboard_image->parent[workerEnv->childId].generation;
- }
if(!workerEnv->was_initialized) {
workerEnv->was_initialized = JK_TRUE;
jk2_init( env, pconf, workerEnv, s );
- if (workerEnv->childId <= 0)
+ if (workerEnv->childId > 0)
env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk2 child %d
initialized\n",
workerEnv->childId);
- }
- if (workerEnv->childGeneration)
- env->l->jkLog(env, env->l, JK_LOG_ERROR, "mod_jk2 child workerEnv in error
state %d\n",
- workerEnv->childGeneration);
-
- /* Restore the process generation */
- if (workerEnv->childId >= 0) {
- ap_scoreboard_image->parent[workerEnv->childId].generation =
workerEnv->childGeneration;
- }
-
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
