added: support for x-forwarded-protocol

petersirka · petersirka · commit a6babaa42f40 · 2014-09-25T18:39:10.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -37,6 +37,7 @@ Framework supports a backward compatibility.
 - added: framework.on('controller-render-meta', function(controller) {})
 - added: framework.on('init')
 - added: framework.merge('/merge.js', '/js/file1.js', '/js/file2.js')
+- added: framework supports X-Forwarded-Protocol header
 
 - updated: (IMPORTANT) all models are loaded after is the framework loaded
 - updated: Utils.request(), timeout is possible to add as cookie, headers or encoding
diff --git a/index.js b/index.js
@@ -3801,7 +3801,7 @@ Framework.prototype._request = function(req, res) {
     self.emit('request', req, res);
 
     var headers = req.headers;
-    var protocol = req.connection.encrypted ? 'https' : 'http';
+    var protocol = req.connection.encrypted || headers['x-forwarded-protocol'] === 'https' ? 'https' : 'http';
 
     if (self._request_check_redirect) {
         var redirect = self.routes.redirects[protocol + '://' + req.host];
diff --git a/minify/total.js/index.js b/minify/total.js/index.js
