costin 02/04/15 16:57:42
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Fix stupid error - now the 2 config phases are corectly detected.
The first step we call the setters - that would allow validation and
warnings for invalid settings.
The second step we call the real init().
Revision Changes Path
1.10 +9 -6 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_jk2.c 11 Apr 2002 19:35:48 -0000 1.9
+++ mod_jk2.c 15 Apr 2002 23:57:42 -0000 1.10
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
/*
@@ -402,19 +402,21 @@
*/
static int jk2_apache2_isValidating(apr_pool_t *gPool, apr_pool_t **mainPool) {
apr_pool_t *tmpPool=NULL;
- void *data=NULL;
+ char *data=NULL;
int i;
for( i=0; i<10; i++ ) {
tmpPool=apr_pool_get_parent( gPool );
if( tmpPool == NULL ) {
+ /* fprintf(stderr, "XXX Found Root pool %p\n", gPool ); */
break;
}
gPool=tmpPool;
}
- if( tmpPool == NULL ) {
+ if( tmpPool != NULL ) {
/* We can't detect the root pool */
+ /* fprintf(stderr, "XXX Can't find root pool\n" ); */
return JK_FALSE;
}
if(mainPool != NULL )
@@ -446,19 +448,20 @@
rc=jk2_apache2_isValidating( plog, &gPool );
- if( rc == JK_TRUE ) {
+ if( rc == JK_TRUE && gPool != NULL ) {
/* This is the first step */
- env->l->jkLog(env, env->l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"mod_jk.post_config() first invocation\n");
apr_pool_userdata_set( "INITOK", "mod_jk_init", NULL, gPool );
return OK;
}
- env->l->jkLog(env, env->l, JK_LOG_INFO,
+ 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;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
