cloudcms-server 4.0.0-beta.17 → 4.0.0-beta.19

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "4.0.0-beta.17",
+  "version": "4.0.0-beta.19",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/server/index.js

@@ -615,16 +615,6 @@ var _start = function(overrides, callback) {
     }
 
 
-    ///////////////////////
-    // auto-configuration for HTTP
-    ///////////////////////
-
-    if (!process.configuration.http) {
-        process.configuration.http = {};
-    }
-    process.configuration.http.keepAliveTimeout = process.defaultKeepAliveMs;
-    process.configuration.http.requestTimeout = process.defaultKeepAliveMs;
-
     ///////////////////////
     // auto-configuration for HTTPS
     ///////////////////////
@@ -632,8 +622,6 @@ var _start = function(overrides, callback) {
     if (!process.configuration.https) {
         process.configuration.https = {};
     }
-    process.configuration.https.keepAliveTimeout = process.defaultKeepAliveMs;
-    process.configuration.https.requestTimeout = process.defaultKeepAliveMs;
 
     if (process.env.CLOUDCMS_HTTPS) {
         process.configuration.https = JSON.parse(process.env.CLOUDCMS_HTTPS);
@@ -656,7 +644,12 @@ var _start = function(overrides, callback) {
     if (process.env.CLOUDCMS_HTTPS_CA_FILEPATH) {
         process.configuration.https.ca = [ fs.readFileSync(process.env.CLOUDCMS_HTTPS_CA_FILEPATH) ];
     }
-    
+
+    // if https config is empty, remove it
+    if (Object.keys(process.configuration.https).length === 0) {
+        delete process.configuration.https;
+    }
+
     // auto configuration of session store
     if (!process.configuration.session) {
         process.configuration.session = {};
@@ -1244,7 +1237,10 @@ var createHttpServer = function(app, done)
             // configure helmet to support auto-upgrade of http->https
             app.use(helmet());
         }
-            
+
+        process.configuration.https.keepAliveTimeout = process.defaultKeepAliveMs;
+        process.configuration.https.requestTimeout = process.defaultKeepAliveMs;
+
         // create https server
         httpServer = https.createServer(process.configuration.https, app);
     }
@@ -1252,7 +1248,10 @@ var createHttpServer = function(app, done)
     {
         // legacy
         //httpServer = http.Server(app);
-        httpServer = http.createServer(process.configuration.http, app);
+        httpServer = http.createServer({
+            "keepAliveTimeout": process.defaultKeepAliveMs,
+            "requestTimeout": process.defaultKeepAliveMs
+        }, app);
     }
     
     // socket timeout
@@ -1271,7 +1270,7 @@ var createHttpServer = function(app, done)
 
         socket.setNoDelay(true);
 
-        socket.setTimeout(requestTimeout, function(socket) {
+        socket.setTimeout(process.defaultHttpTimeoutMs, function(socket) {
             try { socket.end(); } catch (e) { }
             try { socket.destroy(); } catch (e) { }
         });