Win32's ap_os_is_filename_valid forces a 403 return for

OPTIONS *; fix by making a special case for this request
in directorywalk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91978 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 2f217e0c67b5b53d361a7e1a3b8f05df209dcb3a..215de8bb5f3ed79248a43aae148fcb5d786f9920 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,7 @@
+Changes with Apache 1.3.24
+
+  *) Win32: Accept OPTIONS * requests.  [Keith Wannamaker]
+
 Changes with Apache 1.3.23
 
   *) Unixware 7.0 and later did not have a default locking

diff --git a/src/main/http_request.c b/src/main/http_request.c
index 0dfb108550c59ae0701302be28456b3cb45f804c..32bf7ebafc5d9ae68c08362f760e429164b9a847 100644 (file)
--- a/src/main/http_request.c
+++ b/src/main/http_request.c
@@ -417,7 +417,8 @@ static int directory_walk(request_rec *r)
     ap_no2slash(test_filename);
     num_dirs = ap_count_dirs(test_filename);
 
-    if (!ap_os_is_filename_valid(r->filename)) {
+    if (!ap_os_is_filename_valid(r->filename) &&
+        !(r->method_number == M_OPTIONS && !strcmp(r->uri, "*"))) {
         ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "Filename is not valid: %s", r->filename);
         return HTTP_FORBIDDEN;