diff options
author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2014-06-28 22:28:08 +0200 |
---|---|---|
committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2014-06-29 01:17:07 +0200 |
commit | 03b31d113ea316c8384a4cbf3d27ca22bb528eac (patch) | |
tree | 92ed87436b09ab806f9effff08145408044d77f4 /vendor/sabre/dav/lib/Sabre/DAV/Server.php | |
parent | f49b74c5f6ebe57937fb6dfea7d2e917f4680ce9 (diff) | |
download | volse-hubzilla-03b31d113ea316c8384a4cbf3d27ca22bb528eac.tar.gz volse-hubzilla-03b31d113ea316c8384a4cbf3d27ca22bb528eac.tar.bz2 volse-hubzilla-03b31d113ea316c8384a4cbf3d27ca22bb528eac.zip |
Update SabreDAV from 1.8.9 to 1.8.10.
Diffstat (limited to 'vendor/sabre/dav/lib/Sabre/DAV/Server.php')
-rw-r--r-- | vendor/sabre/dav/lib/Sabre/DAV/Server.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Server.php b/vendor/sabre/dav/lib/Sabre/DAV/Server.php index 4aa6cacd4..e0a68ab50 100644 --- a/vendor/sabre/dav/lib/Sabre/DAV/Server.php +++ b/vendor/sabre/dav/lib/Sabre/DAV/Server.php @@ -8,7 +8,7 @@ use Sabre\HTTP; * * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/). * @author Evert Pot (http://evertpot.com/) - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License + * @license http://sabre.io/license/ Modified BSD License */ class Server { @@ -684,6 +684,9 @@ class Server { */ protected function httpDelete($uri) { + // Checking If-None-Match and related headers. + if (!$this->checkPreconditions()) return; + if (!$this->broadcastEvent('beforeUnbind',array($uri))) return; $this->tree->delete($uri); $this->broadcastEvent('afterUnbind',array($uri)); @@ -871,13 +874,13 @@ class Server { } + // Checking If-None-Match and related headers. + if (!$this->checkPreconditions()) return; + if ($this->tree->nodeExists($uri)) { $node = $this->tree->getNodeForPath($uri); - // Checking If-None-Match and related headers. - if (!$this->checkPreconditions()) return; - // If the node is a collection, we'll deny it if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.'); if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false; |