[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - wsd/Storage.cpp

[Jan Holesovsky]

 wsd/Storage.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9bab03070140227f850112716277c82f2fc41424
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jul 17 20:22:06 2018 +0200

    wsd: Don't try to anonymize the /contents at the end.
    
    Change-Id: Ib3737f4afc6d708b7d06acb36f4044df9f5fbe84
    Reviewed-on: https://gerrit.libreoffice.org/57586
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 17b207f84..89e44162d 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -555,7 +555,10 @@ std::string WopiStorage::loadStorageFileToLocal(const Authorization& auth)
     Poco::URI uriObject(_uri);
     uriObject.setPath(uriObject.getPath() + "/contents");
     auth.authorizeURI(uriObject);
-    const std::string uriAnonym = LOOLWSD::anonymizeUrl(uriObject.toString());
+
+    Poco::URI uriObjectAnonym(_uri);
+    uriObjectAnonym.setPath(LOOLWSD::anonymizeUrl(uriObjectAnonym.getPath()) + "/contents");
+    const std::string uriAnonym = uriObjectAnonym.toString();
 
     LOG_DBG("Wopi requesting: " << uriAnonym);