[Libreoffice-commits] online.git: 3 commits - loolwsd/ChildSession.cpp loolwsd/Connect.cpp loolwsd/LOKitClient.cpp

[Tor Lillqvist]

 loolwsd/ChildSession.cpp |    4 +++-
 loolwsd/Connect.cpp      |    2 +-
 loolwsd/LOKitClient.cpp  |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7d4ab644f8bcb7259372b0eb66e582f2e7ac9c6f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 29 17:22:30 2016 +0300

    Add REDLINE_TABLE_ENTRY_MODIFIED

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 4104e3d..b882b79 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -74,6 +74,7 @@ extern "C"
             CASE(VIEW_CURSOR_VISIBLE);
             CASE(VIEW_LOCK);
             CASE(REDLINE_TABLE_SIZE_CHANGED);
+            CASE(REDLINE_TABLE_ENTRY_MODIFIED);
 #undef CASE
         }
         std::cout << " payload: " << pPayload << std::endl;
commit 4409ccd22284c10cbf368b4f261261ec4449adfe
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 29 17:21:47 2016 +0300

    Don't crash if there is no "rendering" in the options JSON of the load message

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 762ffea..3575fa9 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -307,7 +307,9 @@ bool ChildSession::loadDocument(const char * /*buffer*/, int /*length*/, StringT
         Parser parser;
         Poco::Dynamic::Var var = parser.parse(_docOptions);
         Object::Ptr object = var.extract<Object::Ptr>();
-        renderOpts = object->get("rendering").toString();
+        Poco::Dynamic::Var rendering = object->get("rendering");
+        if (!rendering.isEmpty())
+            renderOpts = rendering.toString();
     }
 
     assert(!_docURL.empty());
commit ccdac2f76743d865c258879ff9af0fad96506531
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 29 17:18:27 2016 +0300

    Adapt the GET after 8cc367638f7a0e5da56905510dda76075401cb4e
    
    The thing to GET is now lool/ws/ + the actual document URL.

diff --git a/loolwsd/Connect.cpp b/loolwsd/Connect.cpp
index f6cc287..5b10efa 100644
--- a/loolwsd/Connect.cpp
+++ b/loolwsd/Connect.cpp
@@ -174,7 +174,7 @@ protected:
 #else
         HTTPClientSession cs(_uri.getHost(), _uri.getPort());
 #endif
-        HTTPRequest request(HTTPRequest::HTTP_GET, args[0]);
+        HTTPRequest request(HTTPRequest::HTTP_GET, std::string("lool/ws/") + args[0]);
         HTTPResponse response;
         WebSocket ws(cs, request, response);