mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adding OC-ETag header

This commit is contained in:
Thomas Müller 2014-08-29 12:09:33 +02:00
parent 2370af62ea
commit 30ee8b6f99
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/connector/sabre/file.php
View File

@ -247,8 +247,7 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile {
* @throws \Sabre\DAV\Exception\NotImplemented * @throws \Sabre\DAV\Exception\NotImplemented
* @throws \Sabre\DAV\Exception\ServiceUnavailable * @throws \Sabre\DAV\Exception\ServiceUnavailable
*/ */
private function createFileChunked($data) private function createFileChunked($data) {
{
list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($this->path); list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($this->path);
$info = \OC_FileChunking::decodeName($name); $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); $info = $this->fileView->getFileInfo($targetPath);
return $info->getEtag(); return $info->getEtag();
} catch (\OCP\Files\StorageNotAvailableException $e) { } catch (\OCP\Files\StorageNotAvailableException $e) {

17
lib/private/connector/sabre/filesplugin.php
View File

@ -174,7 +174,24 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
if (!is_null($fileId)) { if (!is_null($fileId)) {
$this->server->httpResponse->setHeader('OC-FileId', $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();
}
} }