mturk 2005/02/13 04:23:46
Modified: jk/native/apache-1.3 mod_jk.c
Log:
Implement new API calls for shm and set vhost uriworker_map
Revision Changes Path
1.65 +10 -8 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mod_jk.c 12 Feb 2005 11:55:33 -0000 1.64
+++ mod_jk.c 13 Feb 2005 12:23:46 -0000 1.65
@@ -618,7 +618,7 @@
s->num_headers++;
}
}
-
+ s->uw_map = conf->uw_map;
return JK_TRUE;
}
@@ -1936,13 +1936,15 @@
r->prev && r->prev->handler &&
!strcmp(r->prev->handler, JK_HANDLER) && r->uri &&
strlen(r->uri) && r->uri[strlen(r->uri) - 1] == '/') {
+
+ if (worker_env.num_of_workers) {
+ /* Nothing here to do but assign the first worker since
we
+ * already tried mapping and it didn't work out */
+ worker = worker_env.worker_list[0];
- /* Nothing here to do but assign the first worker since we
- * already tried mapping and it didn't work out */
- worker = worker_env.first_worker;
-
- jk_log(l, JK_LOG_DEBUG, "Manual configuration for %s %s",
- r->uri, worker_env.first_worker);
+ jk_log(l, JK_LOG_DEBUG, "Manual configuration for %s %s",
+ r->uri, worker_env.worker_list[0]);
+ }
}
if (worker) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
