glenn 2005/01/12 09:23:11
Modified: jk/native/apache-2.0 mod_jk.c
Log:
Fix a bug where a mod_dir sub-request was not being handled.
apr_filepath_name_get() would return an empty string rather than
a NULL pointer.
PS: Thanks for the recent work on mod_jk.
Revision Changes Path
1.115 +3 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mod_jk.c 7 Jan 2005 09:55:33 -0000 1.114
+++ mod_jk.c 12 Jan 2005 17:23:11 -0000 1.115
@@ -2530,7 +2530,8 @@
/* Only if sub-request for a directory, most likely from mod_dir */
if (r->main && r->main->filename &&
- !apr_filepath_name_get(r->main->filename)) {
+ (!apr_filepath_name_get(r->main->filename) ||
+ !strlen(apr_filepath_name_get(r->main->filename)))) {
/* The filename from the main request will be set to what should
* be picked up, aliases included. Tomcat will need to know about
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
