forcessl server module fix

diff --git a/server/app.js b/server/app.js
index a36bfdb1e45f09cf3eee79e86a1dfe090f1e07d7..df7ce55d66d9df05e195262e0ffc9198394ce0fc 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -532,7 +532,7 @@ this.httpHandler = function (request, response) {
         min = {}, public_http_path, port, ssl, host, obj, args, ircuri, pass, target, modifiers, query,
         secure = (typeof request.client.encrypted === 'object');
 
-    //try {
+    try {
         if (kiwi.config.handle_http) {
             // Run through any plugins..
             args = {request: request, response: response, ssl: secure};
@@ -708,10 +708,10 @@ this.httpHandler = function (request, response) {
             }
         }
 
-    //} catch (e) {
-    //    console.log('ERROR app.httpHandler()');
-    //    console.log(e);
-    //}
+    } catch (e) {
+        console.log('ERROR app.httpHandler()');
+        console.log(e);
+    }
 };
 
 

diff --git a/server/kiwi_modules/forcessl.js b/server/kiwi_modules/forcessl.js
index b8ae4e580303b6379e0c99377e995b6f60a3f568..d5102994fead6e6de1b70a77c44c7c253907b349 100644 (file)
--- a/server/kiwi_modules/forcessl.js
+++ b/server/kiwi_modules/forcessl.js
@@ -9,9 +9,7 @@ var kiwi = require('../kiwi.js');
 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 (!opts.ssl) {
+       if (!ev.ssl) {
            host = ev.request.headers.host;
 
            // Remove the port if one is set
@@ -19,9 +17,9 @@ exports.onhttp = function (ev, opts) {
                host = host.substring(0, host.search(/:/));
            }
 
-       for (i in kiwi.config.ports) {
-               if (kiwi.config.ports[i].secure) {
-                       port = kiwi.config.ports[i].number;
+       for (i in kiwi.config.servers) {
+               if (kiwi.config.servers[i].secure) {
+                       port = kiwi.config.servers[i].port;
                        break;
                }
        }
@@ -35,8 +33,7 @@ exports.onhttp = function (ev, opts) {
            if (port !== 443) {
                host += ':' + port.toString();
            }
-
-           console.log('https://' + host + ev.request.url);
+           
            ev.response.writeHead(302, {'Location': 'https://' + host + ev.request.url});
            ev.response.end();