You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2006/01/23 21:23:32 UTC
svn commit: r371650 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
modules/dav/main/mod_dav.c
Author: colm
Date: Mon Jan 23 12:23:25 2006
New Revision: 371650
URL: http://svn.apache.org/viewcvs?rev=371650&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/modules/dav/main/mod_dav.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371650&r1=371649&r2=371650&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 12:23:25 2006
@@ -1,6 +1,9 @@
-*- 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]
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=371650&r1=371649&r2=371650&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon Jan 23 12:23:25 2006
@@ -133,14 +133,6 @@
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:
Modified: httpd/httpd/branches/2.0.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/dav/main/mod_dav.c?rev=371650&r1=371649&r2=371650&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.0.x/modules/dav/main/mod_dav.c Mon Jan 23 12:23:25 2006
@@ -2490,7 +2490,7 @@
}
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.",