From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 23 Aug 2001 19:00:07 +0000 (+0000)
Subject:   Canonicalization will now occur on all sub_req_lookup_file() calls,
X-Git-Tag: 2.0.25~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b977a59852c954c75247303f902f313ad3fbd375;p=apache

  Canonicalization will now occur on all sub_req_lookup_file() calls,
  and the ap_server_root_relative() will handle canonicalization as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90566 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/dav/fs/mod_dav_fs.c b/modules/dav/fs/mod_dav_fs.c
index 98493d7145..f72aabc803 100644
--- a/modules/dav/fs/mod_dav_fs.c
+++ b/modules/dav/fs/mod_dav_fs.c
@@ -104,7 +104,6 @@ static const char *dav_fs_cmd_davlockdb(cmd_parms *cmd, void *config,
 
     conf = ap_get_module_config(cmd->server->module_config,
                                 &dav_fs_module);
-    arg1 = ap_os_canonical_filename(cmd->pool, arg1);
     conf->lockdb_path = ap_server_root_relative(cmd->pool, arg1);
 
     return NULL;
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index aa1f8ffedb..baa5d9ad7f 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -777,12 +777,9 @@ static int dav_method_get(request_rec *r)
 	    return HTTP_NOT_FOUND;
 	}
 
-	/* Convert to canonical filename, so Apache detects component
-	 * separators (on Windows, it only looks for '/', not '\')
-	 */
-	pathname = ap_os_case_canonical_filename(r->pool, pathname);
-
-	/* Create a sub-request with the new filename */
+	/* Create a sub-request with the new filename 
+         * The new_req filename is canonicalized by ap_sub_req_lookup_file()
+         */
 	new_req = ap_sub_req_lookup_file(pathname, r, NULL);
 	if (new_req == NULL) {
 	    (*resource->hooks->free_file)(fhandle);