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 98493d7145b4f12921c4845a5c3303961d910a94..f72aabc8036f51c32acf03997661f5f3e0c25023 100644 (file)
--- 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 aa1f8ffedb6ed35c29c9c663dcb4dd165737f9e2..baa5d9ad7f7f6ec241109fc55f0c3c7dd16ba199 100644 (file)
--- 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);