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

Merge pull request #13932 from owncloud/revert-sabredav-etag-master 

Revert "adding OC-ETag header"
This commit is contained in:
Thomas Müller 2015-02-06 12:05:32 +01:00
parent bd60abbefc 8210200770
commit bc56fef619
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,21 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
return $this->info->getSize();
}
/**
* Returns the ETag for a file
*
* An ETag is a unique identifier representing the current version of the
* file. If the file changes, the ETag MUST change. The ETag is an
* arbitrary string, but MUST be surrounded by double-quotes.
*
* Return null if the ETag can not effectively be determined
*
* @return mixed
*/
public function getETag() {
return '"' . $this->info->getEtag() . '"';
}
/**
* Returns the mime-type for a file
*

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

@ -123,10 +123,6 @@ class OC_Connector_Sabre_FilesPlugin extends \Sabre\DAV\ServerPlugin
if (!is_null($fileId)) {
$this->server->httpResponse->setHeader('OC-FileId', $fileId);
}
$eTag = $node->getETag();
if (!is_null($eTag)) {
$this->server->httpResponse->setHeader('OC-ETag', $eTag);
}
}
}

16
lib/private/connector/sabre/node.php
View File

@ -281,20 +281,4 @@ abstract class OC_Connector_Sabre_Node implements \Sabre\DAV\INode, \Sabre\DAV\I
}
return $p;
}
/**
* Returns the ETag for a file
*
* An ETag is a unique identifier representing the current version of the
* file. If the file changes, the ETag MUST change. The ETag is an
* arbitrary string, but MUST be surrounded by double-quotes.
*
* Return null if the ETag can not effectively be determined
*
* @return mixed
*/
public function getETag() {
return '"' . $this->info->getEtag() . '"';
}
}