costin 02/03/23 09:27:13
Modified: jk/native2/common jk_uriMap.c jk_workerEnv.c
Log:
- fix a NPE in uriMap
- if no config file was specified in httpd.conf ( or whatever server config file is
used ),
default to conf/jk2.properties.
That means you'll be able to set up mod_jk by just including the module, no other
server-specific settings will be needed for the common case.
Revision Changes Path
1.19 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_uriMap.c 18 Mar 2002 18:45:05 -0000 1.18
+++ jk_uriMap.c 23 Mar 2002 17:27:13 -0000 1.19
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <[EMAIL PROTECTED]>
- * Version: $Revision: 1.18 $
+ * Version: $Revision: 1.19 $
*/
#include "jk_pool.h"
@@ -453,7 +453,7 @@
if( _this->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.mapUri() matched %s %s\n",
- uri, _this->maps[best_match]->worker->mbean->name );
+ uri, _this->maps[best_match]->workerName );
return _this->maps[best_match];
}
1.21 +10 -3 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_workerEnv.c 20 Mar 2002 23:44:37 -0000 1.20
+++ jk_workerEnv.c 23 Mar 2002 17:27:13 -0000 1.21
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***************************************************************************/
#include "jk_env.h"
@@ -229,11 +229,18 @@
int err;
char *opt;
int options;
+ char *configFile;
env->l->init( env, env->l );
- env->l->jkLog(env, env->l, JK_LOG_INFO, "mod_jk.init_jk()\n" );
-
+ configFile=wEnv->initData->get( env, wEnv->initData, "config.file" );
+ env->l->jkLog(env, env->l, JK_LOG_ERROR, "workerEnv.init() %s\n", configFile );
+ if( configFile == NULL ) {
+ wEnv->config->setPropertyString( env, wEnv->config,
+ "config.file",
+ "conf/jk2.properties" );
+ }
+
jk2_workerEnv_initWorkers( env, wEnv );
jk2_workerEnv_initHandlers( env, wEnv );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
