From: Graham Leggett <minfrin@apache.org>
Date: Fri, 24 May 2013 11:59:51 +0000 (+0000)
Subject: Reverting as per veto in http://svn.apache.org/r1486021.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bfc6e66e156ff791c7aee7cf85300fb9d047856;p=thirdparty%2Fapache%2Fhttpd.git

Reverting as per veto in http://svn.apache.org/r1486021.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1486026 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 145a5032400..4c8c9d0cae2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -112,9 +112,6 @@ Changes with Apache 2.5.0
      namespace httpd segfaults. PR 52559 [Diego Santa Cruz
      <diego.santaCruz spinetix.com>]
 
-  *) mod_dav: PROPPATCH delete (svn propdel) silently discards errors.
-     PR 53525 [Arwin Arni <arwin collab.net>]
-
   *) mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
      [Timothy Wood <tjw omnigroup.com>]
 
diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c
index 507ba52d8b6..e5eaef165a4 100644
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -1042,9 +1042,11 @@ DAV_DECLARE_NONSTD(void) dav_prop_exec(dav_prop_ctx *ctx)
         else if (ctx->operation == DAV_PROP_OP_DELETE) {
 
             /*
-            ** Delete the property.
+            ** Delete the property. Ignore errors -- the property is there, or
+            ** we are deleting it for a second time.
             */
-            err = (*propdb->db_hooks->remove)(propdb->db, &name);
+            /* ### but what about other errors? */
+            (void) (*propdb->db_hooks->remove)(propdb->db, &name);
         }
     }