You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@locus.apache.org on 2000/03/11 14:39:16 UTC
cvs commit: apache-1.3/src/os/os2 util_os2.c
bjh 00/03/11 05:39:15
Modified: src ApacheCoreOS2.def
src/include httpd.h
src/os/os2 util_os2.c
Log:
Implement ap_os_case_canonical_filename() for OS/2. Fixes SCRIPT_NAME
CGI var if PATH_INFO has upper case value & possibly other things too.
Revision Changes Path
1.7 +1 -0 apache-1.3/src/ApacheCoreOS2.def
Index: ApacheCoreOS2.def
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCoreOS2.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheCoreOS2.def 1999/11/27 02:37:35 1.6
+++ ApacheCoreOS2.def 2000/03/11 13:39:14 1.7
@@ -366,3 +366,4 @@
ap_sha1_base64 @360
ap_add_file_conf @361
ap_set_config_vectors @362
+ ap_os_case_canonical_filename @363
1.309 +3 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- httpd.h 2000/02/28 13:42:24 1.308
+++ httpd.h 2000/03/11 13:39:14 1.309
@@ -1088,6 +1088,9 @@
#ifdef WIN32
API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, const char *szFile);
API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool, const char *szFile);
+#elif defined(OS2)
+API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, const char *szFile);
+#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f)
#else
#define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f)
#define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f)
1.7 +10 -3 apache-1.3/src/os/os2/util_os2.c
Index: util_os2.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/os2/util_os2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util_os2.c 2000/02/27 06:07:10 1.6
+++ util_os2.c 2000/03/11 13:39:15 1.7
@@ -5,7 +5,7 @@
#include "http_log.h"
-API_EXPORT(char *)ap_os_canonical_filename(pool *pPool, const char *szFile)
+API_EXPORT(char *)ap_os_case_canonical_filename(pool *pPool, const char *szFile)
{
char buf[HUGE_STRING_LEN];
char buf2[HUGE_STRING_LEN];
@@ -30,14 +30,21 @@
}
}
- strlwr(buf2);
-
/* Switch backslashes to forward */
for (pos=buf2; *pos; pos++)
if (*pos == '\\')
*pos = '/';
return ap_pstrdup(pPool, buf2);
+}
+
+
+
+API_EXPORT(char *)ap_os_canonical_filename(pool *pPool, const char *szFile)
+{
+ char *szCanonicalFile = ap_os_case_canonical_filename(pPool, szFile);
+ strlwr(szCanonicalFile);
+ return szCanonicalFile;
}