wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "adding OC-ETag header"

Browse source 
This reverts commit 30ee8b6f99.
This commit is contained in:
Vincent Petry 2015-03-26 15:04:41 +01:00
parent daceb1a9ac
commit a84ade5f32
2 changed files with 2 additions and 20 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,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) {

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

@ -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();
}
}