[Box Backup-commit] COMMIT r3637 - box/trunk/lib/httpserver

subversion at boxbackup.org subversion at boxbackup.org
Sat Aug 29 09:46:58 BST 2015


Author: chris
Date: 2015-08-29 08:46:57 +0000 (Sat, 29 Aug 2015)
New Revision: 3637

Modified:
   box/trunk/lib/httpserver/HTTPServer.cpp
   box/trunk/lib/httpserver/HTTPServer.h
   box/trunk/lib/httpserver/S3Simulator.h
Log:
Increase S3Simulator HTTP timeout to aid debugging

Modified: box/trunk/lib/httpserver/HTTPServer.cpp
===================================================================
--- box/trunk/lib/httpserver/HTTPServer.cpp	2015-08-29 08:46:44 UTC (rev 3636)
+++ box/trunk/lib/httpserver/HTTPServer.cpp	2015-08-29 08:46:57 UTC (rev 3637)
@@ -27,8 +27,8 @@
 //		Created: 26/3/04
 //
 // --------------------------------------------------------------------------
-HTTPServer::HTTPServer()
-	: mTimeout(20000)	// default timeout leaves a little while for clients to get the second request in.
+HTTPServer::HTTPServer(int Timeout)
+: mTimeout(Timeout)
 {
 }
 

Modified: box/trunk/lib/httpserver/HTTPServer.h
===================================================================
--- box/trunk/lib/httpserver/HTTPServer.h	2015-08-29 08:46:44 UTC (rev 3636)
+++ box/trunk/lib/httpserver/HTTPServer.h	2015-08-29 08:46:57 UTC (rev 3637)
@@ -27,7 +27,8 @@
 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

Modified: box/trunk/lib/httpserver/S3Simulator.h
===================================================================
--- box/trunk/lib/httpserver/S3Simulator.h	2015-08-29 08:46:44 UTC (rev 3636)
+++ box/trunk/lib/httpserver/S3Simulator.h	2015-08-29 08:46:57 UTC (rev 3637)
@@ -27,7 +27,9 @@
 class S3Simulator : public HTTPServer
 {
 public:
-	S3Simulator() { }
+	// Increase timeout to 5 minutes, from HTTPServer default of 1 minute,
+	// to help with debugging.
+	S3Simulator() : HTTPServer(300000) { }
 	~S3Simulator() { }
 
 	const ConfigurationVerify* GetConfigVerify() const;




More information about the Boxbackup-commit mailing list