From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 30 Sep 2013 09:45:52 +0000 (+0200)
Subject: Merge branch 'master' into fixing-4546-master
X-Git-Tag: v6.0.0alpha2~11^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2301e8b6975a213f05468f171229f7a1986a377;p=nextcloud-server.git

Merge branch 'master' into fixing-4546-master

Conflicts:
	lib/connector/sabre/directory.php
---

a2301e8b6975a213f05468f171229f7a1986a377
diff --cc lib/connector/sabre/directory.php
index ddeef271a5b,382bdf06df1..4087c088f1a
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@@ -55,46 -55,46 +55,33 @@@ class OC_Connector_Sabre_Directory exte
  		}
  
  		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 -			$info = OC_FileChunking::decodeName($name);
 -			if (empty($info)) {
 -				throw new Sabre_DAV_Exception_NotImplemented();
 -			}
 -			$chunk_handler = new OC_FileChunking($info);
 -			$chunk_handler->store($info['index'], $data);
 -			if ($chunk_handler->isComplete()) {
 -				$newPath = $this->path . '/' . $info['name'];
 -				$chunk_handler->file_assemble($newPath);
 -				return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 -			}
 -		} else {
 -			$newPath = $this->path . '/' . $name;
 +			return $this->createFileChunked($name, $data);
 +		}
 +		$newPath = $this->path . '/' . $name;
  
 -			// mark file as partial while uploading (ignored by the scanner)
 -			$partpath = $newPath . '.part';
 +		// mark file as partial while uploading (ignored by the scanner)
 +		$partpath = $newPath . '.part';
  
 -			\OC\Files\Filesystem::file_put_contents($partpath, $data);
 +		\OC\Files\Filesystem::file_put_contents($partpath, $data);
  
- 		//detect aborted upload
- 		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
- 			if (isset($_SERVER['CONTENT_LENGTH'])) {
- 				$expected = $_SERVER['CONTENT_LENGTH'];
- 				$actual = \OC\Files\Filesystem::filesize($partpath);
- 				if ($actual != $expected) {
- 					\OC\Files\Filesystem::unlink($partpath);
- 					throw new Sabre_DAV_Exception_BadRequest(
- 							'expected filesize ' . $expected . ' got ' . $actual);
- 				}
 -			// rename to correct path
 -			$renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath);
 -			$fileExists = \OC\Files\Filesystem::file_exists($newPath);
 -			if ($renameOkay === false || $fileExists === false) {
 -				\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
 -				\OC\Files\Filesystem::unlink($partpath);
 -				throw new Sabre_DAV_Exception();
--			}
- 		}
- 
 +		// rename to correct path
 +		$renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath);
 +		$fileExists = \OC\Files\Filesystem::file_exists($newPath);
 +		if ($renameOkay === false || $fileExists === false) {
 +			\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
 +			\OC\Files\Filesystem::unlink($partpath);
 +			throw new Sabre_DAV_Exception();
 +		}
  
 -			// allow sync clients to send the mtime along in a header
 -			$mtime = OC_Request::hasModificationTime();
 -			if ($mtime !== false) {
 -				if(\OC\Files\Filesystem::touch($newPath, $mtime)) {
 -					header('X-OC-MTime: accepted');
 -				}
 +		// allow sync clients to send the mtime along in a header
 +		$mtime = OC_Request::hasModificationTime();
 +		if ($mtime !== false) {
 +			if(\OC\Files\Filesystem::touch($newPath, $mtime)) {
 +				header('X-OC-MTime: accepted');
  			}
 -
 -			return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
  		}
  
 -		return null;
 +		return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
  	}
  
  	/**