diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 6465dcbac3..a5676d656e 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -68,6 +68,16 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		
 			\OC\Files\Filesystem::file_put_contents($partpath, $data);
 			
+			//detect aborted upload
+			if (isset($_SERVER['CONTENT_LENGTH'])
+				&& \OC\Files\Filesystem::filesize($partpath) != $_SERVER['CONTENT_LENGTH'])
+			{
+				throw new Sabre_DAV_Exception_BadRequest(
+						'expected filesize ' . $_SERVER['CONTENT_LENGTH'].
+						' got ' . \OC\Files\Filesystem::filesize($partpath)
+						);
+			}
+			
 			// rename to correct path
 			\OC\Files\Filesystem::rename($partpath, $newPath);
 			
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 279615b923..ab342fa2c6 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -50,6 +50,15 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		
 		\OC\Files\Filesystem::file_put_contents($partpath, $data);
 		
+		//detect aborted upload
+		if (isset($_SERVER['CONTENT_LENGTH'])
+			&& \OC\Files\Filesystem::filesize($partpath) != $_SERVER['CONTENT_LENGTH'])
+		{
+			throw new Sabre_DAV_Exception_BadRequest(
+					'expected filesize ' . $_SERVER['CONTENT_LENGTH'].
+					' got ' . \OC\Files\Filesystem::filesize($partpath)
+					);
+		}
 		// rename to correct path
 		\OC\Files\Filesystem::rename($partpath, $this->path);