Prefer an explicitly given protocol.

The baseURL might be configured with HTTPS,
but the actual HTTPS layer might be provided by a proxy.
Therefore, the server should be able to launch as HTTP
by explicitly setting the protocol.

Author: RubenVerborgh

Diff for: bin/ldf-server

@@ -20,10 +20,15 @@ var configDefaults = JSON.parse(fs.readFileSync(path.join(__dirname, '../config/
     config = _.defaults(JSON.parse(fs.readFileSync(args[0])), configDefaults),
     port = parseInt(args[1], 10) || config.port,
     workers = parseInt(args[2], 10) || config.workers,
-    protocolMatch = (config.baseURL || '').match(/^(\w+):/),
-    protocol = config.protocol = protocolMatch ? protocolMatch[1] : 'http',
+    protocol = config.protocol,
     constructors = {};
 
+// Determine protocol
+if (!protocol) {
+  var protocolMatch = (config.baseURL || '').match(/^(\w+):/);
+  protocol = config.protocol = protocolMatch ? protocolMatch[1] : 'http';
+}
+
 // Start up a cluster master
 if (cluster.isMaster) {
   // Create workers