mturk 2002/10/04 09:10:38
Modified: jk/native2/server/apache13 mod_jk2.c
Log:
Fix the logger.file, using ap_server_root like on Apache2.
Revision Changes Path
1.23 +14 -8 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_jk2.c 27 Sep 2002 13:18:26 -0000 1.22
+++ mod_jk2.c 4 Oct 2002 16:10:38 -0000 1.23
@@ -73,6 +73,7 @@
#include "http_main.h"
#include "http_log.h"
#include "util_script.h"
+#include "http_conf_globals.h"
/*
* Jakarta (jk_) include files
@@ -172,7 +173,9 @@
/* Create the logger . We use the default jk logger, will output
to a file. Check the logger for default settings.
*/
- jkb=env->createBean2( env, env->globalPool, "logger.file", "");
+ jkb=env->createBean2( env, env->globalPool, "logger.file", "");
+ env->alias( env, "logger.file:", "logger");
+ env->alias( env, "logger.file:", "logger:");
if( jkb==NULL ) {
fprintf(stderr, "Error creating logger ");
return JK_ERR;
@@ -195,14 +198,17 @@
return JK_ERR;
}
- /* Local initialization.
- */
+ /* serverRoot via ap_server_root
+ */
+ workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
+ workerEnv->pool->pstrdup( env, workerEnv->pool,
ap_server_root));
+
+ /* Local initialization.
+ */
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "Set serverRoot %s\n", ap_server_root);
+
workerEnv->_private = (void *)s;
- /* serverRoot via ap_server_root_relative()
- */
- workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
- ap_server_root_relative(p,""));
return JK_OK;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
