net/Socket.hpp | 15 ++++++++------- net/WebSocketHandler.hpp | 8 ++++++-- wsd/ClientSession.cpp | 13 +++++++------ wsd/DocumentBroker.cpp | 12 +++++++----- 4 files changed, 28 insertions(+), 20 deletions(-)
New commits: commit bdd8b715ddfac90ea814ea87f58a2985a2bc66c0 Author: Ashod Nakashian <[email protected]> Date: Sat May 20 13:28:43 2017 -0400 wsd: include cleanup Change-Id: I9f28ee329e318043c31c899d3a07cd3139d838f0 Reviewed-on: https://gerrit.libreoffice.org/37890 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/net/Socket.hpp b/net/Socket.hpp index 7c7b55ab..88e24f05 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -21,20 +21,21 @@ #include <atomic> #include <cassert> #include <cerrno> +#include <chrono> #include <cstdlib> #include <cstring> #include <fstream> +#include <functional> #include <iostream> #include <memory> #include <mutex> #include <sstream> #include <thread> -#include <chrono> -#include "Common.hpp" -#include "Log.hpp" -#include "Util.hpp" -#include "SigUtil.hpp" +#include "common/Common.hpp" +#include "common/Log.hpp" +#include "common/Util.hpp" +#include "common/SigUtil.hpp" namespace Poco { @@ -136,8 +137,8 @@ public: virtual void setNoDelay() { const int val = 1; - setsockopt (_fd, IPPROTO_TCP, TCP_NODELAY, - (char *) &val, sizeof(val)); + ::setsockopt(_fd, IPPROTO_TCP, TCP_NODELAY, + (char *) &val, sizeof(val)); } /// Sets the kernel socket send buffer in size bytes. diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 4ff01c36..7c52cf58 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -10,8 +10,12 @@ #ifndef INCLUDED_WEBSOCKETHANDLER_HPP #define INCLUDED_WEBSOCKETHANDLER_HPP -#include "Common.hpp" -#include "Log.hpp" +#include <chrono> +#include <memory> +#include <vector> + +#include "common/Common.hpp" +#include "common/Log.hpp" #include "Socket.hpp" #include <Poco/Net/HTTPRequest.h> diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index d21d925d..387f7629 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -14,16 +14,17 @@ #include <fstream> #include <Poco/Net/HTTPResponse.h> +#include <Poco/StringTokenizer.h> #include <Poco/URI.h> -#include "Common.hpp" +#include "common/Common.hpp" #include "DocumentBroker.hpp" #include "LOOLWSD.hpp" -#include "Log.hpp" -#include "Protocol.hpp" -#include "Session.hpp" -#include "Util.hpp" -#include "Unit.hpp" +#include "common/Log.hpp" +#include "common/Protocol.hpp" +#include "common/Session.hpp" +#include "common/Util.hpp" +#include "common/Unit.hpp" using namespace LOOLProtocol; diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 5b5f4ebd..956a2fe6 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -11,6 +11,7 @@ #include "DocumentBroker.hpp" +#include <atomic> #include <cassert> #include <chrono> #include <ctime> @@ -27,14 +28,14 @@ #include "Admin.hpp" #include "ClientSession.hpp" #include "Exceptions.hpp" -#include "Message.hpp" -#include "Protocol.hpp" #include "LOOLWSD.hpp" -#include "Log.hpp" +#include "SenderQueue.hpp" #include "Storage.hpp" #include "TileCache.hpp" -#include "SenderQueue.hpp" -#include "Unit.hpp" +#include "common/Log.hpp" +#include "common/Message.hpp" +#include "common/Protocol.hpp" +#include "common/Unit.hpp" using namespace LOOLProtocol; @@ -409,6 +410,7 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s LOG_ERR("Failed to create Storage instance for [" << _docKey << "] in " << jailPath.toString()); return false; } + firstInstance = true; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
