[Libreoffice-commits] online.git: net/WebSocketHandler.hpp
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 17 02:27:47 UTC 2019
net/WebSocketHandler.hpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit fca12fc1ab45c4c215ffd05814a34bb8b9855c8e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Mar 31 23:30:05 2019 -0400
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sat Aug 17 04:27:26 2019 +0200
wsd: formatting
Change-Id: I07b91c494fe89395ebe1e91506baef46dc03aca8
Reviewed-on: https://gerrit.libreoffice.org/70035
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/71092
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 30381a7ed..f37d459a2 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -227,7 +227,8 @@ public:
if (payloadLen + headerLen > len)
{ // partial read wait for more data.
- LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket frame, have " << len << " bytes, frame is " << payloadLen + headerLen << " bytes");
+ LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket frame, have " << len
+ << " bytes, frame is " << payloadLen + headerLen << " bytes");
return false;
}
@@ -238,7 +239,8 @@ public:
return true;
}
- LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " << len << " bytes: " << Util::stringifyHexLine(socket->getInBuffer(), 0, std::min((size_t)32, len)));
+ LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " << len << " bytes: "
+ << Util::stringifyHexLine(socket->getInBuffer(), 0, std::min((size_t)32, len)));
data = p + headerLen;
@@ -693,7 +695,8 @@ protected:
{
std::shared_ptr<StreamSocket> socket = _socket.lock();
- LOG_TRC("Incoming client websocket upgrade response: " << std::string(&socket->getInBuffer()[0], socket->getInBuffer().size()));
+ LOG_TRC("Incoming client websocket upgrade response: "
+ << std::string(&socket->getInBuffer()[0], socket->getInBuffer().size()));
bool bOk = false;
StreamSocket::MessageMap map;
@@ -715,8 +718,9 @@ protected:
map._headerSize = itBody - socket->getInBuffer().begin() + marker.size();
}
- if (response.getStatus() == Poco::Net::HTTPResponse::HTTP_SWITCHING_PROTOCOLS &&
- response.has("Upgrade") && Poco::icompare(response.get("Upgrade"), "websocket") == 0)
+ if (response.getStatus() == Poco::Net::HTTPResponse::HTTP_SWITCHING_PROTOCOLS
+ && response.has("Upgrade")
+ && Poco::icompare(response.get("Upgrade"), "websocket") == 0)
{
#if 0 // SAL_DEBUG ...
const std::string wsKey = response.get("Sec-WebSocket-Accept", "");
More information about the Libreoffice-commits
mailing list