HTTP plugin handler SSL detection fix

diff --git a/server/app.js b/server/app.js
index 8e970ad5a863918e19b68f3fa6b82c648505e418..a36bfdb1e45f09cf3eee79e86a1dfe090f1e07d7 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -535,7 +535,7 @@ this.httpHandler = function (request, response) {
     //try {
         if (kiwi.config.handle_http) {
             // Run through any plugins..
-            args = {request: request, response: response};
+            args = {request: request, response: response, ssl: secure};
             obj = kiwi.kiwi_mod.run('http', args);
             if (obj === null) {
                 return;

diff --git a/server/kiwi_modules/forcessl.js b/server/kiwi_modules/forcessl.js
index fb9498344dd41429ee11a246f33d1933594a65d6..b8ae4e580303b6379e0c99377e995b6f60a3f568 100644 (file)
--- a/server/kiwi_modules/forcessl.js
+++ b/server/kiwi_modules/forcessl.js
@@ -6,12 +6,12 @@
 var kiwi = require('../kiwi.js');
 
 
-exports.onhttp = function (ev) {
+exports.onhttp = function (ev, opts) {
        var host, port = null, i;
 
        // TODO: request.socket.pair seems to only be set in a SSL req, is this
        // the best way to check for this?
-       if (typeof ev.request.socket.pair === 'undefined') {
+       if (!opts.ssl) {
            host = ev.request.headers.host;
 
            // Remove the port if one is set