costin 02/04/11 12:35:48
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Set server root. Fix stupid {} problem.
Revision Changes Path
1.9 +6 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_jk2.c 5 Apr 2002 19:13:56 -0000 1.8
+++ mod_jk2.c 11 Apr 2002 19:35:48 -0000 1.9
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
/*
@@ -298,7 +298,9 @@
return;
}
- workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
ap_server_root);
+ workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
+ workerEnv->pool->pstrdup( env, workerEnv->pool,
ap_server_root));
+ env->l->jkLog(env, env->l, JK_LOG_ERROR, "Set serverRoot %s\n", ap_server_root);
/* Local initialization */
workerEnv->_private = s;
@@ -623,9 +625,10 @@
to support SetHandler, we can add it back easily */
/* Check JkMount directives, if any */
- if( workerEnv->uriMap->size == 0 )
+ if( workerEnv->uriMap->size == 0 ) {
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
return DECLINED;
+ }
/* XXX TODO: Split mapping, similar with tomcat. First step will
be a quick test ( the context mapper ), with no allocations.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
