loolwsd/LOOLSession.cpp | 4 ++-- loolwsd/test/httpwstest.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit ef30af121a92dd78a37a1f4bccf22b2756d2030f Author: Tor Lillqvist <[email protected]> Date: Mon Feb 22 13:50:01 2016 +0200 Log a bit more information diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp index 70be4d6..08f10d5 100644 --- a/loolwsd/LOOLSession.cpp +++ b/loolwsd/LOOLSession.cpp @@ -84,7 +84,7 @@ void LOOLSession::sendTextFrame(const std::string& text) { if (!_ws) { - Log::error("Error: No socket to send to."); + Log::error("Error: No socket to send " + getAbbreviatedMessage(text.c_str(), text.size()) + " to."); return; } else @@ -105,7 +105,7 @@ void LOOLSession::sendBinaryFrame(const char *buffer, int length) { if (!_ws) { - Log::error("Error: No socket to send to."); + Log::error("Error: No socket to send binary frame of " + std::to_string(length) + " bytes to."); return; } else commit 5a69177f74400dc0006389eeafc7b59702556e0b Author: Tor Lillqvist <[email protected]> Date: Mon Feb 22 13:48:15 2016 +0200 We are not interested in the payload of CLOSE frames diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index b6c64c4..dca3f75 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -106,7 +106,7 @@ void HTTPWSTest::testPaste() { char buffer[READ_BUFFER_SIZE]; n = socket.receiveFrame(buffer, sizeof(buffer), flags); - if (n > 0) + if (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) { const std::string line = LOOLProtocol::getFirstLine(buffer, n); const std::string prefix = "textselectioncontent: "; @@ -160,7 +160,7 @@ void HTTPWSTest::testLargePaste() { char buffer[READ_BUFFER_SIZE]; n = socket.receiveFrame(buffer, sizeof(buffer), flags); - if (n > 0) + if (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) { std::string line = LOOLProtocol::getFirstLine(buffer, n); std::string prefix = "textselectioncontent: "; @@ -198,7 +198,7 @@ void HTTPWSTest::testRenderingOptions() { char buffer[READ_BUFFER_SIZE]; n = socket.receiveFrame(buffer, sizeof(buffer), flags); - if (n > 0) + if (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) { std::string line = LOOLProtocol::getFirstLine(buffer, n); std::string prefix = "status: "; @@ -402,7 +402,7 @@ bool HTTPWSTest::isDocumentLoaded(Poco::Net::WebSocket& ws) if (ws.poll(waitTime, Poco::Net::Socket::SELECT_READ)) { bytes = ws.receiveFrame(buffer, sizeof(buffer), flags); - if (bytes > 0) + if (bytes > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) { const std::string line = LOOLProtocol::getFirstLine(buffer, bytes); const std::string prefixIndicator = "statusindicatorfinish:"; @@ -448,7 +448,7 @@ void HTTPWSTest::getResponseMessage(Poco::Net::WebSocket& ws, const std::string& if (ws.poll(waitTime, Poco::Net::Socket::SELECT_READ)) { bytes = ws.receiveFrame(buffer, sizeof(buffer), flags); - if (bytes > 0) + if (bytes > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) { const std::string message = isLine ? LOOLProtocol::getFirstLine(buffer, bytes) : _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
