Make X-HAS-{MD5/SHA256} opt-in

This is not always needed and slow down the upload

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit 1b426eda44f59648d2f1c5b79a06c78ff74c9fce)

diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 963a07a55fb40ccfb2a71a23107c37fee1945400..760ffcd02ccae2b1f2509f5a95e64b2cb2eeb470 100644 (file)
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -212,15 +212,26 @@ class File extends Node implements IFile {
                                $data = $tmpData;
                        }
 
-                       $data = HashWrapper::wrap($data, 'md5', function ($hash) {
-                               $this->header('X-Hash-MD5: ' . $hash);
-                       });
-                       $data = HashWrapper::wrap($data, 'sha1', function ($hash) {
-                               $this->header('X-Hash-SHA1: ' . $hash);
-                       });
-                       $data = HashWrapper::wrap($data, 'sha256', function ($hash) {
-                               $this->header('X-Hash-SHA256: ' . $hash);
-                       });
+                       if ($this->request->getHeader('X-HASH') !== '') {
+                               $hash = $this->request->getHeader('X-HASH');
+                               if ($hash === 'all' || $hash === 'md5') {
+                                       $data = HashWrapper::wrap($data, 'md5', function ($hash) {
+                                               $this->header('X-Hash-MD5: ' . $hash);
+                                       });
+                               }
+
+                               if ($hash === 'all' || $hash === 'sha1') {
+                                       $data = HashWrapper::wrap($data, 'sha1', function ($hash) {
+                                               $this->header('X-Hash-SHA1: ' . $hash);
+                                       });
+                               }
+
+                               if ($hash === 'all' || $hash === 'sha256') {
+                                       $data = HashWrapper::wrap($data, 'sha256', function ($hash) {
+                                               $this->header('X-Hash-SHA256: ' . $hash);
+                                       });
+                               }
+                       }
 
                        if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
                                $isEOF = false;