You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2003/10/04 11:26:00 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2003/10/04 02:26:00
Modified: jk/native/apache-2.0 mod_jk.c
Log:
apr_filename_of_pathname has been deprecated since apr
version 0.9.3, and it doesn't exist in version 0.9.4 any more.
Revision Changes Path
1.87 +6 -4 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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mod_jk.c 30 Sep 2003 13:41:54 -0000 1.86
+++ mod_jk.c 4 Oct 2003 09:26:00 -0000 1.87
@@ -91,9 +91,11 @@
#include "util_date.h"
#endif
-/* changed with apr 1.0 */
+/* deprecated with apr 0.9.3 */
#include "apr_version.h"
-#if (APR_MAJOR_VERSION < 1)
+#if (APR_MAJOR_VERSION == 0) && \
+ (APR_MINOR_VERSION <= 9) && \
+ (APR_PATCH_VERSION < 3)
#define apr_filepath_name_get apr_filename_of_pathname
#endif
@@ -2412,7 +2414,7 @@
/* 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)){
/* 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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org