Merge branch 'refactor-redirect-middleware'

shanebo · Dec 7, 2015 · da525d1 · da525d1
2 parents fb86e6d + dafd174
commit da525d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/middleware/redirects.js b/lib/middleware/redirects.js
@@ -23,17 +23,15 @@ Redirects.prototype = {
     },
 
     handler: function(request, response, next){
-        // update this to use request.hostname, request.protocol
-        var protocol = request.connection.encrypted ? 'https://' : 'http://';
-        var host = request.headers.host ? request.headers.host.split(':')[0] : false;
         var url = request.url.toLowerCase();
+        var domain = request.protocol + '//' + request.hostname;
 
         if (this.redirects[url]) {
             response.redirect(this.redirects[url], 301);
-        } else if (!host) {
+        } else if (!request.hostname) {
             next();
-        } else if (this.redirects[protocol + host]) {
-            response.redirect(this.redirects[protocol + host] + url, 301);
+        } else if (this.redirects[domain]) {
+            response.redirect(this.redirects[domain] + url, 301);
         } else {
             next();
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calvin",
-	"version": "0.9.13",
+	"version": "0.9.14",
 	"description": "A tiny server, router, and middleware framework.",
 	"keywords": ["framework"],
 	"repository": "git://github.com/shanebo/calvin.git",