Fix fuzzers build

- the HttpEcho build broke with commit
  08d9081280 (net: don't try to set
  TCP_NODELAY on local Unix sockets., 2023-10-30)

- fix an unused variable error from commit
  0631593c96 (wasm: proxy wopi documents,
  2023-11-06).

- the undefined reference to COOLWSD::ForKitProcId probably went wrong
  in commit 3f46c1db44 (kit-in-process:
  pure re-factor to a run-time function to flag this., 2023-11-20)

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I0cf06d188860bdb2f795485a91c7634b596255aa
pull/7746/head
Miklos Vajna 2023-11-27 16:51:16 +01:00 committed by Caolán McNamara
parent 2afa6db0ca
commit 1e125c7bdc
3 changed files with 5 additions and 4 deletions

View File

@ -45,9 +45,9 @@ class HttpRequestTests final
class ServerSocketFactory final : public SocketFactory
{
std::shared_ptr<Socket> create(const int physicalFd) override
std::shared_ptr<Socket> create(const int physicalFd, Socket::Type type) override
{
return StreamSocket::create<StreamSocket>("localhost", physicalFd, false,
return StreamSocket::create<StreamSocket>("localhost", physicalFd, type, false,
std::make_shared<ServerRequestHandler>());
}
};

View File

@ -898,10 +898,8 @@ void sendLoadResult(std::shared_ptr<ClientSession> clientSession, bool success,
std::atomic<uint64_t> COOLWSD::NextConnectionId(1);
#if !MOBILEAPP
#ifndef KIT_IN_PROCESS
std::atomic<int> COOLWSD::ForKitProcId(-1);
std::shared_ptr<ForKitProcess> COOLWSD::ForKitProc;
#endif
bool COOLWSD::NoCapsForKit = false;
bool COOLWSD::NoSeccomp = false;
bool COOLWSD::AdminEnabled = true;

View File

@ -340,6 +340,7 @@ void WopiProxy::download(SocketPoll& poll, const std::string& url, const Poco::U
std::chrono::milliseconds callDurationMs =
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() -
startTime);
(void)callDurationMs;
// Note: we don't log the response if obfuscation is enabled, except for failures.
std::string wopiResponse = httpResponse->getBody();
@ -381,3 +382,5 @@ void WopiProxy::download(SocketPoll& poll, const std::string& url, const Poco::U
// Run the CheckFileInfo request on the WebServer Poll.
_httpSession->asyncRequest(httpRequest, poll);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */