[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/PrisonerSession.cpp

Henry Castro hcastro at collabora.com
Mon Mar 27 01:14:38 UTC 2017


 wsd/PrisonerSession.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 994fbbfc9669973015b1e0409df982b86a54cd8c
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Nov 27 22:39:50 2016 -0400

    tdf#106274 wsd: fix sending wrong UTF-8 string to the client
    
    Client side console error "ws stopped cannot read
    utf8 string", the cause it is sending special character '{',
    '}',
    
    Conflicts:
            wsd/PrisonerSession.cpp
    
    Change-Id: Ide757ed5206a7674b0004f80d1f28847d770209a
    Reviewed-on: https://gerrit.libreoffice.org/34789
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/wsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp
index faf8232b..93611f7e 100644
--- a/wsd/PrisonerSession.cpp
+++ b/wsd/PrisonerSession.cpp
@@ -243,6 +243,8 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
             Poco::URI::encode(text, "", encodedChar);
             assert(firstLine.size() < static_cast<std::string::size_type>(length));
             _docBroker->tileCache().saveRendering(font+encodedChar, "font", buffer + firstLine.size() + 1, length - firstLine.size() - 1);
+            forwardToPeer(_peer, buffer, length, true);
+            return true;
         }
     }
     else


More information about the Libreoffice-commits mailing list