diff options
author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:49:13 -0500 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:49:13 -0500 |
commit | f28f88e5e72ba1499409047a9d6985eb312c0232 (patch) | |
tree | c9c267f18264b3dfe715a363935bb6ac20904492 /lib/httpserver/HTTPServer.h | |
parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
parent | 6d7e9562e8485591a4888f1fc2d3c6c657dc7a01 (diff) |
Merge tag 'BoxBackup-0.12.master.180102.6d7e956' into upstream
Diffstat (limited to 'lib/httpserver/HTTPServer.h')
-rw-r--r-- | lib/httpserver/HTTPServer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/httpserver/HTTPServer.h b/lib/httpserver/HTTPServer.h index d9f74949..8ac1ff83 100644 --- a/lib/httpserver/HTTPServer.h +++ b/lib/httpserver/HTTPServer.h @@ -27,7 +27,8 @@ class HTTPResponse; class HTTPServer : public ServerStream<SocketStream, 80> { public: - HTTPServer(); + HTTPServer(int Timeout = 60000); + // default timeout leaves 1 minute for clients to get a second request in. ~HTTPServer(); private: // no copying @@ -62,7 +63,7 @@ private: const char *DaemonName() const; const ConfigurationVerify *GetConfigVerify() const; void Run(); - void Connection(SocketStream &rStream); + void Connection(std::auto_ptr<SocketStream> apStream); }; // Root level |