summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-10-25 21:33:57 +0300
committerTor Lillqvist <tml@collabora.com>2018-10-25 21:33:57 +0300
commit8bc97c0f9e6b0fa7483b44ed6faa6bfbc2f17999 (patch)
tree58a82cf2a5eef1b6f755006163f33c3c010f4f18
parent16a805e290e5a276f44728cf428efe7f31de0622 (diff)
-rw-r--r--net/WebSocketHandler.hpp2
-rw-r--r--wsd/LOOLWSD.cpp6
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<unsigned char*>(&socket->_inBuffer[0]);
+ unsigned char * const p = reinterpret_cast<unsigned char*>(&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<ChildProcess>, 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
}