Commit ebb2d511 authored by Joe Orton's avatar Joe Orton
Browse files

Backport from HEAD: 

  * modules/dav/fs/repos.c (dav_fs_create_collection): Give a 409 rather
  than a 403 if apr_dir_make fails with ENOENT.

  * modules/dav/main/mod_dav.c (dav_method_put): Fix segfault
  in auto-versioning error handling path.

PR: 29034, 29148
Reviewed by: Jeff Trawick, Andr�� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103869 13f79535-47bb-0310-9956-ffa450edef68
parent 770fbfd6

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ Changes with Apache 2.0.50 
     (trusted) client certificate subject DN which exceeds 6K in length.

     [Joe Orton]









  *) mod_dav_fs: Fix MKCOL response for missing parent collections, which 









     caused issues for the Eclipse WebDAV extension.









     PR 29034.  [Joe Orton]

















  *) mod_deflate: Fix memory consumption (which was proportional to the









     response size).  PR 29318.  [Joe Orton]










































STATUS



+1
−12



























Changes for STATUS: 1 added line, 12 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/06/07 10:31:51 $]









Last modified at [$Date: 2004/06/07 10:41:00 $]



















Release:




















@@ -204,17 +204,6 @@ PATCHES TO BACKPORT FROM 2.1







       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_auth_digest.c?r1=1.86&r2=1.87









       +1: geoff, nd



















    *) mod_dav: Fix a segfault in an autoversioning error path.









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.106&r2=1.107









       PR: 29148









       +1: jorton, trawick, nd



















    *) mod_dav: Fix a 2518 compliance issue which affects Eclipse; give a 409 









       rather than a 403 for a MKCOL with a missing intermediate collection









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/fs/repos.c?r1=1.80&r2=1.81









       PR: 29034









       +1: jorton, trawick, nd



















    *) mod_dav: Send an EOS at the end of the multistatus brigade.









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.105&r2=1.106









       +1: jorton


































modules/dav/fs/repos.c



+5
−0



























Changes for modules/dav/fs/repos.c: 5 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -987,6 +987,11 @@ static dav_error * dav_fs_create_collection(dav_resource *resource)







                             "There is not enough storage to create "









                             "this collection.");









    }









    else if (APR_STATUS_IS_ENOENT(status)) {









        return dav_new_error(ctx->pool, HTTP_CONFLICT, 0,









                             "Cannot create collection; intermediate "









                             "collection does not exist.");









    }









    else if (status != APR_SUCCESS) {









        /* ### refine this error message? */









        return dav_new_error(ctx->pool, HTTP_FORBIDDEN, 0,


































modules/dav/main/mod_dav.c



+1
−1



























Changes for modules/dav/main/mod_dav.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1019,7 +1019,7 @@ static int dav_method_put(request_rec *r)

















    if (err2 != NULL) {









        /* just log a warning */









        err2 = dav_push_error(r->pool, err->status, 0,









        err2 = dav_push_error(r->pool, err2->status, 0,









                              "The PUT was successful, but there "









                              "was a problem automatically checking in "









                              "the resource or its parent collection.",