[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

Pranav Kant pranavk at collabora.com
Tue Jun 21 10:39:47 UTC 2016


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

New commits:
commit 31009fa9c10212afa6f29f27b61286ce90bdd140
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

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


More information about the Libreoffice-commits mailing list