Merge pull request #553 from walmartlabs/pack

Pack server event and socket timeout override
hapijs · Feb 19, 2013 · 19e9cb0 · 19e9cb0
2 parents 29426c1 + 20ce4f5
commit 19e9cb0
Show file tree

Hide file tree

Showing 6 changed files with 220 additions and 139 deletions.
diff --git a/lib/defaults.js b/lib/defaults.js
@@ -53,8 +53,9 @@ exports.server = {
     // timeout limits
 
     timeout: {
-        client: 10000,                              // Determines how long to wait for a client connection to end before erroring out
-        server: null                                // server timeout disabled by default
+        socket: null,                               // Determines how long before closing request socket. Defaults to node (2 minutes)
+        client: 10 * 1000,                          // Determines how long to wait for receiving client payload. Defaults to 10 seconds
+        server: null                                // Determines how long to wait for server request processing. Disabled by default
     },
 
     // Optional components