Merge master into 5.0.0 branch

Author: kjetilk

lib/create-server.js

@@ -80,20 +80,20 @@ function createServer (argv, app) {
   }
 
   // Look for port or list of ports to redirect to argv.port
-  if ('redirectHTTPFrom' in argv) {
-    const redirectHTTPFroms = argv.redirectHTTPFrom.constructor === Array
-          ? argv.redirectHTTPFrom
-          : [argv.redirectHTTPFrom]
+  if ('redirectHttpFrom' in argv) {
+    const redirectHttpFroms = argv.redirectHttpFrom.constructor === Array
+          ? argv.redirectHttpFrom
+          : [argv.redirectHttpFrom]
     const portStr = argv.port === 443 ? '' : ':' + argv.port
-    redirectHTTPFroms.forEach(redirectHTTPFrom => {
-      debug.settings('will redirect from port ' + redirectHTTPFrom + ' to port ' + argv.port)
+    redirectHttpFroms.forEach(redirectHttpFrom => {
+      debug.settings('will redirect from port ' + redirectHttpFrom + ' to port ' + argv.port)
       let redirectingServer = express()
       redirectingServer.get('*', function (req, res) {
         let host = req.headers.host.split(':') // ignore port
         debug.server(host, '=> https://' + host + portStr + req.url)
         res.redirect('https://' + host + portStr + req.url)
       })
-      redirectingServer.listen(redirectHTTPFrom)
+      redirectingServer.listen(redirectHttpFrom)
     })
   }