jim 99/02/20 09:57:54
Modified: . STATUS
src CHANGES
src/os/os2 util_os2.c
Log:
Add Brian Havard's os/2 patch for removing
ap_assert() which caused ap_os_canonical_filename() under
os/2 to die with a bad filename
Revision Changes Path
1.628 +1 -8 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- STATUS 1999/02/19 14:25:04 1.627
+++ STATUS 1999/02/20 17:57:50 1.628
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/19 14:25:04 $]
+ Last modified at [$Date: 1999/02/20 17:57:50 $]
Release:
@@ -51,13 +51,6 @@
* Martin's [PATCH] use ap_execve() for suexec if
defined(NEED_HASHBANG_EMUL)
MID: <[EMAIL PROTECTED]>
Status: Martin +1
-
- * Brian Havard's [PATCH] Improve OS/2 ap_os_canonical_filename()'s
- behaviour.
- This allows <Directory proxy:*> directives to work and prevents invalid
- requests from killing the process.
- MID: <[EMAIL PROTECTED]>
- Status: Jim +1
* Ken's [PATCH] Merge RefererIgnore into mod_log_config
Allows mod_log_agent and mod_log_referer to be dropped from
1.1255 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1254
retrieving revision 1.1255
diff -u -r1.1254 -r1.1255
--- CHANGES 1999/02/20 02:37:48 1.1254
+++ CHANGES 1999/02/20 17:57:51 1.1255
@@ -1,5 +1,10 @@
Changes with Apache 1.3.5
+ *) OS/2 ap_os_canonical_filename()'s behaviour is improved: ap_assert()
+ is removed. This allows <Directory proxy:*> directives to work and
+ prevents invalid requests from killing the process.
+ [Brian Havard <[EMAIL PROTECTED]>]
+
*) Reorganised FAQ document.
[Joshua Slive <[EMAIL PROTECTED]>]
1.2 +11 -1 apache-1.3/src/os/os2/util_os2.c
Index: util_os2.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/os2/util_os2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util_os2.c 1998/07/20 16:40:40 1.1
+++ util_os2.c 1999/02/20 17:57:53 1.2
@@ -1,4 +1,5 @@
#define INCL_DOSFILEMGR
+#define INCL_DOSERRORS
#include <os2.h>
#include "httpd.h"
#include "http_log.h"
@@ -19,7 +20,16 @@
buf[--len] = 0;
rc = DosQueryPathInfo(buf, FIL_QUERYFULLNAME, buf2, HUGE_STRING_LEN);
- ap_assert(rc == 0);
+
+ if (rc) {
+ if ( rc != ERROR_INVALID_NAME ) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, NULL, "OS/2
error %d for file %s", rc, szFile);
+ return ap_pstrdup(pPool, "");
+ } else {
+ return ap_pstrdup(pPool, szFile);
+ }
+ }
+
strlwr(buf2);
/* Switch backslashes to forward */
