wsd/ClientSession.cpp | 2 ++ wsd/DocumentBroker.cpp | 4 +++- wsd/LOOLWSD.cpp | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit c1ebc62c3a8e5d088e5d3910bacc60690a0454b6 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Aug 7 14:40:27 2019 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Aug 7 14:41:37 2019 +0300 Fix build for MOBILEAPP The iOS app does not work any longer, though. Hits an assertion failure. Change-Id: Ia135c12a79427e5c2b6c3c98adef4c354d1ceb68 diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index 4cdc3fea2..c24f04f57 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -1252,8 +1252,10 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt if (!empty) { oss.write(&payload->data()[header], payload->size() - header); +#if !MOBILEAPP socket->setSocketBufferSize(std::min(payload->size() + 256, size_t(Socket::MaximumSendBufferSize))); +#endif } socket->send(oss.str()); socket->shutdown(); diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index be1794eb7..be154d537 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -275,12 +275,12 @@ void DocumentBroker::pollThread() uint64_t adminSent = 0; uint64_t adminRecv = 0; auto lastBWUpdateTime = std::chrono::steady_clock::now(); - auto last30SecCheckTime = std::chrono::steady_clock::now(); auto lastClipboardHashUpdateTime = std::chrono::steady_clock::now(); int limit_load_secs = LOOLWSD::getConfigValue<int>("per_document.limit_load_secs", 100); auto loadDeadline = std::chrono::steady_clock::now() + std::chrono::seconds(limit_load_secs); #endif + auto last30SecCheckTime = std::chrono::steady_clock::now(); // Main polling loop goodness. while (!_stop && _poll->continuePolling() && !TerminationFlag) @@ -1585,8 +1585,10 @@ bool DocumentBroker::lookupSendClipboardTag(const std::shared_ptr<StreamSocket> << "X-Content-Type-Options: nosniff\r\n" << "\r\n"; oss.write(saved->c_str(), saved->length()); +#if !MOBILEAPP socket->setSocketBufferSize(std::min(saved->length() + 256, size_t(Socket::MaximumSendBufferSize))); +#endif socket->send(oss.str()); socket->shutdown(); LOG_INF("Found and queued clipboard response for send of size " << saved->length()); diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 9cccc78df..1e7febb0b 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1946,6 +1946,8 @@ private: } }; +#if !MOBILEAPP + /// For clipboard setting class ClipboardPartHandler : public PartHandler { @@ -1964,6 +1966,8 @@ public: } }; +#endif + /// Handles incoming connections and dispatches to the appropriate handler. class ClientRequestDispatcher : public SocketHandlerInterface { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
