costin 02/04/18 15:56:13
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Call init in child_init, post config is not the right point.
Revision Changes Path
1.11 +27 -22 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_jk2.c 15 Apr 2002 23:57:42 -0000 1.10
+++ mod_jk2.c 18 Apr 2002 22:56:13 -0000 1.11
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
/*
@@ -357,26 +357,6 @@
}
-/** Standard apache callback, initialize jk.
- */
-static void jk2_child_init(apr_pool_t *pconf,
- server_rec *s)
-{
- jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
- ap_get_module_config(s->module_config, &jk2_module);
- jk_env_t *env;
-
- if( workerEnv==NULL )
- workerEnv = serverEnv->workerEnv;
-
- env=workerEnv->globalEnv;
-
- env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init\n" );
-
- /* jk2_init( pconf, conf, s );
- do we need jk2_child_init? For ajp14? */
-}
-
/** Initialize jk, using worker.properties.
We also use apache commands ( JkWorker, etc), but this use is
deprecated, as we'll try to concentrate all config in
@@ -458,14 +438,39 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"mod_jk.post_config() second invocation\n" );
+
+
+/* if(!workerEnv->was_initialized) { */
+/* workerEnv->was_initialized = JK_TRUE; */
+
+/* jk2_init( env, pconf, workerEnv, s ); */
+/* } */
+ return OK;
+}
+
+/** Standard apache callback, initialize jk.
+ */
+static void jk2_child_init(apr_pool_t *pconf,
+ server_rec *s)
+{
+ jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
+ ap_get_module_config(s->module_config, &jk2_module);
+ jk_env_t *env;
+
+ if( workerEnv==NULL )
+ workerEnv = serverEnv->workerEnv;
+
+ env=workerEnv->globalEnv;
+
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk child init %d\n",
workerEnv->was_initialized );
if(!workerEnv->was_initialized) {
workerEnv->was_initialized = JK_TRUE;
jk2_init( env, pconf, workerEnv, s );
}
- return OK;
}
+
/* ========================================================================= */
/* The JK module handlers */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
