wsd/Storage.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 994f8993d9d1d6fdc9f7b48fa0efcc0f4bb1ec15
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Nov 21 14:34:36 2019 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Nov 21 14:34:36 2019 +0000
Add proof for locking calls (and mend the build).
Change-Id: I4cbaf682a14316750a676a14d986ecf59045581d
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index c68a5752f..d751f2f27 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -690,7 +690,7 @@ bool WopiStorage::updateLockState(const Authorization
&auth, LockContext &lockCt
Poco::URI uriObject(getUri());
auth.authorizeURI(uriObject);
- std::string reuseStorageCookies = getReuseCookies(uriObject);
+ std::map<std::string, std::string> params = GetQueryParams(uriObject);
Poco::URI uriObjectAnonym(getUri());
uriObjectAnonym.setPath(LOOLWSD::anonymizeUrl(uriObjectAnonym.getPath()));
@@ -713,7 +713,8 @@ bool WopiStorage::updateLockState(const Authorization
&auth, LockContext &lockCt
request.set("X-LOOL-WOPI-ExtendedData", getExtendedData());
addStorageDebugCookie(request);
if (_reuseCookies)
- addStorageReuseCookie(request, reuseStorageCookies);
+ addStorageReuseCookie(request, params["reuse_cookies"]);
+ addWopiProof(request, params["access_token"]);
psession->sendRequest(request);
Poco::Net::HTTPResponse response;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
