Merge branch 'master' into sabre-objecttree

3 files changed, 27 insertions, 3 deletions

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 6990d928cff..bf3a49593cb 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -60,4 +60,25 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 		}
 		return $user;
 	}
+
+	/**
+	  * Override function here. We want to cache authentication cookies
+	  * in the syncing client to avoid HTTP-401 roundtrips.
+	  * If the sync client supplies the cookies, then OC_User::isLoggedIn()
+	  * will return true and we can see this WebDAV request as already authenticated,
+	  * even if there are no HTTP Basic Auth headers.
+	  * In other case, just fallback to the parent implementation.
+	  *
+	  * @return bool
+	  */
+	public function authenticate(Sabre_DAV_Server $server, $realm) {
+		if (OC_User::isLoggedIn()) {
+			$user = OC_User::getUser();
+			OC_Util::setupFS($user);
+			$this->currentUser = $user;
+			return true;
+		}
+
+		return parent::authenticate($server, $realm);
+    }
 }
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 438d9871c22..06ab73e3e4d 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -115,8 +115,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function getSize() {
 		$this->getFileinfoCache();
-		return $this->fileinfo_cache['size'];
-
+		if ($this->fileinfo_cache['size'] > -1) {
+			return $this->fileinfo_cache['size'];
+		} else {
+			return null;
+		}
 	}
 
 	/**
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 04be410ac85..16c88b96ea6 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -121,6 +121,6 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	}
 
 	function searchPrincipals($prefixPath, array $searchProperties) {
-		return 0;
+		return array();
 	}
 }