diff options
| author | Peter Martischka <pita@pitapoison.de> | 2010-04-09 16:42:33 +0200 |
|---|---|---|
| committer | Peter Martischka <pita@pitapoison.de> | 2010-04-09 16:42:33 +0200 |
| commit | 6938cf57d04bf1af1065c054e7002d44d48265ab (patch) | |
| tree | 85d7f6fb4d746eab82a37048a4bc362699a9e6cd /etherpad | |
| parent | 404c1592338501433b624b4b1c86c8c3a7676451 (diff) | |
| download | etherpad-6938cf57d04bf1af1065c054e7002d44d48265ab.tar.gz etherpad-6938cf57d04bf1af1065c054e7002d44d48265ab.tar.xz etherpad-6938cf57d04bf1af1065c054e7002d44d48265ab.zip | |
Revert "Can't really use SSL when checking for it always returns false, right?"
This reverts commit b2661df17ef0765d07fbb9233f1f37fec96e1dfe.
Diffstat (limited to 'etherpad')
| -rw-r--r-- | etherpad/src/main.js | 8 |
1 files changed, 8 insertions, 0 deletions
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) { |