costin 02/04/29 23:53:34
Modified: jk/native2/server/apache13 mod_jk2.c
jk/native2/server/apache2 mod_jk2.c
Log:
Update the workers.
Need to check IIS as well.
Revision Changes Path
1.11 +4 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_jk2.c 25 Apr 2002 19:25:11 -0000 1.10
+++ mod_jk2.c 30 Apr 2002 06:53:34 -0000 1.11
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
/*
@@ -227,7 +227,7 @@
jkb=workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
workerEnv->pool,
- "uri", NULL );
+ "uri", "" );
newUri = jkb->object;
newUri->workerEnv=workerEnv;
return newUri;
@@ -414,8 +414,8 @@
}
/* Check JkMount directives, if any */
- if( workerEnv->uriMap->size == 0 )
- return DECLINED;
+/* if( workerEnv->uriMap->size == 0 ) */
+/* return DECLINED; */
/* get_env() */
env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
1.14 +15 -14 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_jk2.c 25 Apr 2002 19:25:11 -0000 1.13
+++ mod_jk2.c 30 Apr 2002 06:53:34 -0000 1.14
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.13 $ *
+ * Version: $Revision: 1.14 $ *
***************************************************************************/
/*
@@ -220,7 +220,8 @@
* unique. We'll have to generate a unique name
*/
jk_bean_t *jkb=workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
- workerEnv->pool, "uri", path
);
+ workerEnv->pool, "uri",
+ (path==NULL)? "":path );
jk_uriEnv_t *newUri = jkb->object;
newUri->workerEnv=workerEnv;
newUri->mbean->setAttribute( workerEnv->globalEnv, newUri->mbean, "path", path
);
@@ -236,12 +237,12 @@
/* XXX */
- fprintf(stderr, "XXX Merged dir config %p %p %s %s %p %p\n",
- base, new, base->uri, add->uri, base->webapp, add->webapp);
+ fprintf(stderr, "XXX Merged dir config %p %p %s %s\n",
+ base, new, base->uri, add->uri);
- if( add->webapp == NULL ) {
- add->webapp=base->webapp;
- }
+/* if( add->webapp == NULL ) { */
+/* add->webapp=base->webapp; */
+/* } */
return add;
}
@@ -329,7 +330,7 @@
jkb = workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
workerEnv->pool,
- "uri", NULL );
+ "uri", "" );
newUri=jkb->object;
newUri->workerEnv=workerEnv;
@@ -523,8 +524,8 @@
} else {
worker=uriEnv->worker;
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() per dir worker for %p %p\n",
- worker, uriEnv->webapp );
+ "mod_jk.handler() per dir worker for %p\n",
+ worker );
if( worker==NULL && uriEnv->workerName != NULL ) {
worker=env->getByName( env, uriEnv->workerName);
@@ -631,10 +632,10 @@
to support SetHandler, we can add it back easily */
/* Check JkMount directives, if any */
- if( workerEnv->uriMap->size == 0 ) {
- workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
- return DECLINED;
- }
+/* 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]>
