projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a4c634
)
Pass e2e-token to PropagateUpload subjobs
author
Kevin Ottens
<kevin.ottens@nextcloud.com>
Wed, 8 Jul 2020 13:16:53 +0000
(15:16 +0200)
committer
Camila
<smayres@gmail.com>
Thu, 9 Jul 2020 14:22:54 +0000
(16:22 +0200)
The headers() method is used to pass extra headers to the PUT jobs for
instance, definitely needed for uploads now.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/libsync/propagateupload.cpp
patch
|
blob
|
history
diff --git
a/src/libsync/propagateupload.cpp
b/src/libsync/propagateupload.cpp
index 287c92c4f9f9569c31a7ce7ffeb419072494c651..633d897d7e75080f7eecd8a27c0f3142542f7d28 100644
(file)
--- a/
src/libsync/propagateupload.cpp
+++ b/
src/libsync/propagateupload.cpp
@@
-735,6
+735,10
@@
QMap<QByteArray, QByteArray> PropagateUploadFileCommon::headers()
headers["OC-ConflictBaseEtag"] = conflictRecord.baseEtag;
}
+ if (_uploadEncryptedHelper && !_uploadEncryptedHelper->_folderToken.isEmpty()) {
+ headers.insert("e2e-token", _uploadEncryptedHelper->_folderToken);
+ }
+
return headers;
}