From 03b31d113ea316c8384a4cbf3d27ca22bb528eac Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Sat, 28 Jun 2014 22:28:08 +0200
Subject: Update SabreDAV from 1.8.9 to 1.8.10.

---
 vendor/sabre/dav/lib/Sabre/DAV/Server.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'vendor/sabre/dav/lib/Sabre/DAV/Server.php')

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;
-- 
cgit v1.2.3