From a84ade5f325b190ce14f5817590f3180ecabc33e Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 26 Mar 2015 15:04:41 +0100 Subject: [PATCH] Revert "adding OC-ETag header" This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde. --- lib/private/connector/sabre/file.php | 5 ++--- lib/private/connector/sabre/filesplugin.php | 17 ----------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index bb68f44672..8f0642d794 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -247,7 +247,8 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile { * @throws \Sabre\DAV\Exception\NotImplemented * @throws \Sabre\DAV\Exception\ServiceUnavailable */ - private function createFileChunked($data) { + private function createFileChunked($data) + { list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($this->path); $info = \OC_FileChunking::decodeName($name); @@ -304,8 +305,6 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile { } } - // mark chunking complete - $_SERVER['X-CHUNKING_COMPLETE'] = true; $info = $this->fileView->getFileInfo($targetPath); return $info->getEtag(); } catch (\OCP\Files\StorageNotAvailableException $e) { diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index e03cac9c53..9720519f4c 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -174,24 +174,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { if (!is_null($fileId)) { $this->server->httpResponse->setHeader('OC-FileId', $fileId); } - $eTag = $this->getETag($node); - if (!is_null($eTag)) { - $this->server->httpResponse->setHeader('OC-ETag', $eTag); - } } } - /** - * @param \OC\Connector\Sabre\Node $node - */ - private function getETag($node) { - if (isset($_SERVER['HTTP_OC_CHUNKED'])) { - if (isset($_SERVER['X-CHUNKING_COMPLETE'])) { - return $node->getETag(); - } - return null; - } - return $node->getETag(); - } - }