diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-26 15:34:24 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-26 15:34:24 +0100 |
| commit | e66dda83df536e7bac14d5e5622f10747db63f2f (patch) | |
| tree | 180c19453b685c2c7e591c8e6b856b49f6e2eee2 /lib/private | |
| parent | 0d786c381b8d4656e6bbcb5ef2b33e718ea639eb (diff) | |
| parent | a84ade5f325b190ce14f5817590f3180ecabc33e (diff) | |
| download | nextcloud-server-e66dda83df536e7bac14d5e5622f10747db63f2f.tar.gz nextcloud-server-e66dda83df536e7bac14d5e5622f10747db63f2f.zip | |
Merge pull request #15218 from owncloud/revert-oc-etag-master
Revert oc etag master
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 5 | ||||
| -rw-r--r-- | lib/private/connector/sabre/filesplugin.php | 14 |
2 files changed, 2 insertions, 17 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index bb68f446725..8f0642d794a 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 1b4b0674a57..9720519f4c7 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -174,21 +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 - */ - public function getETag($node) { - if (isset($_SERVER['HTTP_OC_CHUNKED']) && !isset($_SERVER['X-CHUNKING_COMPLETE'])) { - return null; } - return $node->getETag(); } } |