Merge pull request #5365 from owncloud/filesize-improvements-32bit

Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index ab9d3e47d0e..8a16ba55e7a 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Returns the size of the node, in bytes
 	 *
-	 * @return int
+	 * @return int|float
 	 */
 	public function getSize() {
 		return $this->info->getSize();
diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php
index 2660b043f46..cf28b11163f 100644
--- a/lib/private/connector/sabre/server.php
+++ b/lib/private/connector/sabre/server.php
@@ -170,7 +170,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server {
 						if ($node instanceof Sabre_DAV_IFile) {
 							$size = $node->getSize();
 							if (!is_null($size)) {
-								$newProperties[200][$prop] = (int)$node->getSize();
+								$newProperties[200][$prop] = 0 + $size;
 							}
 						}
 						break;