svn commit: r1486026 - in /httpd/httpd/trunk: CHANGES modules/dav/main/props.c

[mi...@apache.org]

Author: minfrin
Date: Fri May 24 11:59:51 2013
New Revision: 1486026

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/dav/main/props.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1486026&r1=1486025&r2=1486026&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri May 24 11:59:51 2013
@@ -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>]
 

Modified: httpd/httpd/trunk/modules/dav/main/props.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/props.c?rev=1486026&r1=1486025&r2=1486026&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/props.c (original)
+++ httpd/httpd/trunk/modules/dav/main/props.c Fri May 24 11:59:51 2013
@@ -1042,9 +1042,11 @@ DAV_DECLARE_NONSTD(void) dav_prop_exec(d
         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);
         }
     }