diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 5 | ||||
| -rw-r--r-- | lib/private/connector/sabre/filesplugin.php | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 8f0642d794a..bb68f446725 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -247,8 +247,7 @@ 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); @@ -305,6 +304,8 @@ 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 9720519f4c7..1b4b0674a57 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -174,7 +174,21 @@ 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(); } } |