You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2005/11/11 23:29:38 UTC
svn commit: r332657 - in /httpd/httpd/branches/2.2.x: CHANGES
modules/dav/main/mod_dav.c
Author: rpluem
Date: Fri Nov 11 14:29:31 2005
New Revision: 332657
URL: http://svn.apache.org/viewcvs?rev=332657&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>
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=332657&r1=332656&r2=332657&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Nov 11 14:29:31 2005
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.1.10
+ *) mod_dav: Fix a null pointer dereference in an error code path during the
+ handling of MKCOL.
+ [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
+
*) mod_proxy_balancer: When finding best worker, use case insensitive
match for scheme and host, but case sensitive for the rest of
the path. [Jim Jagielski, Ruediger Pluem]
Modified: httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c?rev=332657&r1=332656&r2=332657&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c Fri Nov 11 14:29:31 2005
@@ -2508,7 +2508,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.",