From 6938cf57d04bf1af1065c054e7002d44d48265ab Mon Sep 17 00:00:00 2001 From: Peter Martischka Date: Fri, 9 Apr 2010 16:42:33 +0200 Subject: Revert "Can't really use SSL when checking for it always returns false, right?" This reverts commit b2661df17ef0765d07fbb9233f1f37fec96e1dfe. --- etherpad/src/main.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etherpad/src/main.js b/etherpad/src/main.js index 6d99e16..b77d5ee 100644 --- a/etherpad/src/main.js +++ b/etherpad/src/main.js @@ -287,6 +287,14 @@ function checkHost() { // Check for HTTPS function checkHTTPS() { + /* Open-source note: this function used to check the protocol and make + * sure that pages that needed to be secure went over HTTPS, and pages + * that didn't go over HTTP. However, when we open-sourced the code, + * we disabled HTTPS because we didn't want to ship the etherpad.com + * private crypto keys. --aiba */ + return; + + if (stringutils.startsWith(request.path, "/static/")) { return; } if (sessions.getSession().disableHttps || request.params.disableHttps) { -- cgit v1.2.3