From: Graham Leggett <minfrin@apache.org>
Date: Sat, 27 Apr 2013 17:08:22 +0000 (+0000)
Subject: mod_dav: PROPPATCH delete (svn propdel) silently discards errors. PR 53525
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e92e8b0489128a86ba1333980dc1286b109e471;p=thirdparty%2Fapache%2Fhttpd.git

mod_dav: PROPPATCH delete (svn propdel) silently discards errors. PR 53525
Submitted by Arwin Arni <arwin collab.net>


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

diff --git a/CHANGES b/CHANGES
index 9d40d2498a0..88b2af112c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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 d87dd611316..19c7b11aef1 100644
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -1042,11 +1042,9 @@ DAV_DECLARE_NONSTD(void) dav_prop_exec(dav_prop_ctx *ctx)
         else if (ctx->operation == DAV_PROP_OP_DELETE) {
 
             /*
-            ** Delete the property. Ignore errors -- the property is there, or
-            ** we are deleting it for a second time.
+            ** Delete the property.
             */
-            /* ### but what about other errors? */
-            (void) (*propdb->db_hooks->remove)(propdb->db, &name);
+            err = (*propdb->db_hooks->remove)(propdb->db, &name);
         }
     }