You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/08/03 17:00:53 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c
jfclere 01/08/03 08:00:53
Modified: jk/native/common jk_uri_worker_map.c
Log:
When uri does not start with / uwr is not initialised correctly it caused
core in map_uri_to_worker.
Revision Changes Path
1.5 +12 -1 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_uri_worker_map.c 2001/07/02 21:12:59 1.4
+++ jk_uri_worker_map.c 2001/08/03 15:00:53 1.5
@@ -67,7 +67,7 @@
* servlet container. *
* *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -305,6 +305,17 @@
uwr->ctxt_len = strlen(uwr->context);
}
+ } else {
+ /*
+ * JFC: please check...
+ * Not sure what to do, but I try to prevent problems.
+ * I have fixed jk_mount_context() in apache*/mod_jk.c so we should
+ * not arrive here when using Apache.
+ */
+ jk_log(l, JK_LOG_ERROR,
+ "jk_uri_worker_map_t::uri_worker_map_add, invalid context %s\n",
+ uri);
+ return JK_FALSE;
}
uw_map->maps[uw_map->size] = uwr;