Revert "adding OC-ETag header"

This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde.

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index bb68f44672578e949e3661b67ca7f34336edab26..8f0642d794a7a92bf88d3b784fe19b6656a6875e 100644 (file)
--- 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 e03cac9c537772fa6033a6ce13b8ef982d8175b4..9720519f4c7ae4de2af4cc9a8d7f01533fc161b7 100644 (file)
--- 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();
        }
 
 }