*) fix subtle crasher in COPY method

*) update sub-request-creation calls to include new "next filter" arg

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

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 9a98e63572d2b77ba875e3ae93b2cd20dac30fc1..df7c683087f83d409f54c658abda3bbfde63fa81 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -774,7 +774,7 @@ static int dav_method_get(request_rec *r)
        pathname = ap_os_case_canonical_filename(r->pool, pathname);
 
        /* Create a sub-request with the new filename */
-       new_req = ap_sub_req_lookup_file(pathname, r);
+       new_req = ap_sub_req_lookup_file(pathname, r, NULL);
        if (new_req == NULL) {
            (*resource->hooks->free_file)(fhandle);
            return HTTP_INTERNAL_SERVER_ERROR;
@@ -2077,7 +2077,7 @@ static int dav_method_mkcol(request_rec *r)
 static int dav_method_copymove(request_rec *r, int is_move)
 {
     dav_resource *resource;
-    dav_auto_version_info src_av_info;
+    dav_auto_version_info src_av_info = { 0 };
     dav_resource *resnew;
     dav_auto_version_info dst_av_info;
     const char *body;

diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index c845a6422ee988c9b4059dd550a2c6c3f10661fe..e4946d9a89c120844f052d520b559e8778647ef1 100644 (file)
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -275,7 +275,7 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r)
      * same HTTP method on the destination. This allows the destination
      * to apply appropriate restrictions (e.g. readonly).
      */
-    result.rnew = ap_sub_req_method_uri(r->method, new_file, r);
+    result.rnew = ap_sub_req_method_uri(r->method, new_file, r, NULL);
 
     return result;
 }