[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

[Pranav Kant]

 loolwsd/LOOLWSD.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2b5600d49972d8d25565efc5c75a755de1ded2fa
Author: Pranav Kant <pranavk at collabora.com>
Date:   Tue Jun 21 16:06:12 2016 +0530

    loolwsd: Handle document URIs with spaces
    
    DocumentBroker stores encoded docKey, when child answers with
    dockey in its query params, Poco::URI::getQueryParameter gives
    decoded docKey -> mismatch -> document load failed.
    
    Change-Id: I53d7cf9d932b9193f15f56ec74db24e279cf3b94
    (cherry picked from commit 31009fa9c10212afa6f29f27b61286ce90bdd140)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1e27187..a37b3f4 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -955,7 +955,8 @@ public:
                 }
                 else if (param.first == "docKey")
                 {
-                    docKey = param.second;
+                    // We store encoded docKey in DocumentBroker only
+                    URI::encode(param.second, "", docKey);
                 }
             }