Commit 7123da9c authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge r331041 from trunk: 

* Fix a null pointer dereference in dav_method_mkcol during the handling of
  errors from dav_auto_checkin.

Submitted by: Ghassan Misherghi <ghassanm ucdavis.edu>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371650 13f79535-47bb-0310-9956-ffa450edef68
parent 3229d1d1

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.56









  *) mod_dav: Fix a null pointer dereference in an error code path during the









     handling of MKCOL. [Ghassan Misherghi <ghassanm ucdavis.edu>]

















  *) mod_mime_magic: Handle CRLF-format magic files so that it works with









     the default installation on Windows.  [Jeff Trawick]










































STATUS



+0
−8



























Changes for STATUS: 0 added lines, 8 removed lines.



Original line number
Diff line number
Diff line







@@ -133,14 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







         http://svn.apache.org/viewcvs?view=rev&rev=154319









       +1: stoddard, striker, wrowe (as corrected in subsequent patches)



















    *) mod_dav: Fix a null pointer dereference in an error code path during the









       handling of MKCOL.









       Trunk version of patch:









          http://svn.apache.org/viewcvs.cgi?rev=331041&view=rev









       Backport version for 2.0.x of patch:









          Trunk version of patch will work









       +1: rpluem, trawick, colm



















    *) mod_deflate: Fix PR37559 (mod_deflate + mod_proxy overwrite the









       Vary: header)









       Trunk version of patch:


































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







@@ -2490,7 +2490,7 @@ static int dav_method_mkcol(request_rec *r)







    }









    if (err2 != NULL) {









        /* just log a warning */









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









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









                             "The MKCOL was successful, but there "









                             "was a problem automatically checking in "









                             "the parent collection.",