diff options
| author | Graham Leggett <minfrin@apache.org> | 2013-05-24 13:59:51 +0200 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2013-05-24 13:59:51 +0200 |
| commit | 0d1d5098ac620928abeb8546d252c8995338f35b (patch) | |
| tree | 60c78b4904b52f103d969039bd783d8263cac377 /modules/dav/main/props.c | |
| parent | Ensure that any meta buckets are stripped while parsing a chunk. (diff) | |
| download | apache2-0d1d5098ac620928abeb8546d252c8995338f35b.tar.xz apache2-0d1d5098ac620928abeb8546d252c8995338f35b.zip | |
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
Diffstat (limited to 'modules/dav/main/props.c')
| -rw-r--r-- | modules/dav/main/props.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c index 507ba52d8b..e5eaef165a 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); } } |