resolve conflicts coming from PR #586; (small optimizations)

Author: thisIsTheFoxe

lib/http-server.js

@@ -68,24 +68,21 @@ function HttpServer(options) {
 
   var before = options.before ? options.before.slice() : [];
 
-  before.push(function (req, res) {
-    if (options.httpsPort) {
+  if (options.httpsPort) {
+    before.push(function (req, res) {
       var hostname = req.headers.host.match(/:/g) ? req.headers.host.slice(0, req.headers.host.indexOf(':')) : req.headers.host;
       var httpsUrl = 'https://' + hostname + ':' + options.httpsPort + req.url;
       res.writeHead(301, { Location: httpsUrl });
       res.end();
+    });
+  }
 
-      if (options.logFn) {
-        options.logFn(req, res);
-      }
-      return;
-    }
-
-    if (options.logFn) {
+  if (options.logFn) {
+    before.push(function (req, res) {
       options.logFn(req, res);
       res.emit('next');
-    }
-  });
+    });
+  }
 
   if (options.username || options.password) {
     before.push(function (req, res) {