From 8bc97c0f9e6b0fa7483b44ed6faa6bfbc2f17999 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 25 Oct 2018 21:33:57 +0300 Subject: Adapt after 4724aa0cf78f3aedf7f7f4222d251ef8395d5523 --- net/WebSocketHandler.hpp | 2 +- wsd/LOOLWSD.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 3b60fe9b8..f6457787e 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -205,7 +205,7 @@ public: } else _wsPayload.insert(_wsPayload.end(), data, data + payloadLen); #else - unsigned char * const p = reinterpret_cast(&socket->_inBuffer[0]); + unsigned char * const p = reinterpret_cast(&socket->getInBuffer()[0]); _wsPayload.insert(_wsPayload.end(), p, p + len); const size_t headerLen = 0; const size_t payloadLen = len; diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 3f3748247..2af6a1591 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1845,7 +1845,7 @@ private: #else Poco::Process::PID pid = 1; std::string jailId = "jail"; - socket->_inBuffer.clear(); + socket->getInBuffer().clear(); #endif LOG_TRC("Calling make_shared, for NewChildren?"); @@ -2108,8 +2108,8 @@ private: socket->eraseFirstInputBytes(requestSize); #else Poco::Net::HTTPRequest request; - handleClientWsUpgrade(request, std::string(socket->_inBuffer.data(), socket->_inBuffer.size()), disposition); - socket->_inBuffer.clear(); + handleClientWsUpgrade(request, std::string(socket->getInBuffer().data(), socket->getInBuffer().size()), disposition); + socket->getInBuffer().clear(); #endif } -- cgit v1.2.3