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 145a503240097acb9d88720b0c130d67d7485b47..4c8c9d0cae228a8399915011b167d4d5e41e08c1 100644 (file)
--- 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 507ba52d8b6929ce00e77d498c87e4363e254ae0..e5eaef165a46637efcb0ad469eb360140b997d54 100644 (file)
--- 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);
         }
     }