summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-02-05 20:43:37 +0100
committerVincent Petry <pvince81@owncloud.com>2015-02-05 20:43:37 +0100
commit8210200770fa1e7afa2b96f4cb69d1be2064bcad (patch)
treedaeb8cbdda09a99b64ff823d54ab00e8881a3e3b
parent9e222ec841946d773514f790fcc567c634d27038 (diff)
downloadnextcloud-server-8210200770fa1e7afa2b96f4cb69d1be2064bcad.tar.gz
nextcloud-server-8210200770fa1e7afa2b96f4cb69d1be2064bcad.zip
Revert "adding OC-ETag header"
This reverts commit 96a931929ea837a40a7e9b836252587c949a8127.
-rw-r--r--lib/private/connector/sabre/file.php15
-rw-r--r--lib/private/connector/sabre/filesplugin.php4
-rw-r--r--lib/private/connector/sabre/node.php16
3 files changed, 15 insertions, 20 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 12ce633838f..e57d04f9a6e 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -220,6 +220,21 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
}
/**
+ * 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
*
* If null is returned, we'll assume application/octet-stream
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index ff5a6cc8b4b..f6f0fac878b 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -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);
- }
}
}
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 3173ab8a30f..adc37849286 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -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() . '"';
- }
-
}