Commit 2cb4ab20 authored by Greg Stein's avatar Greg Stein
Browse files

*) 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
parent 7bd75795

modules/dav/main/mod_dav.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

modules/dav/main/util.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}