aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Mitchell <etherpad@jefferai.org>2010-04-08 17:10:52 -0400
committerJeff Mitchell <etherpad@jefferai.org>2010-04-08 17:44:57 -0400
commitb2661df17ef0765d07fbb9233f1f37fec96e1dfe (patch)
treea1680a3a4aaa10d87dbaaa9ecddc678edbeb5032
parent90ff702ce5c0d7409ffcc0b3d7955f14f1a2356e (diff)
downloadetherpad-b2661df17ef0765d07fbb9233f1f37fec96e1dfe.tar.gz
etherpad-b2661df17ef0765d07fbb9233f1f37fec96e1dfe.tar.xz
etherpad-b2661df17ef0765d07fbb9233f1f37fec96e1dfe.zip
Can't really use SSL when checking for it always returns false, right?
-rw-r--r--etherpad/src/main.js8
1 files changed, 0 insertions, 8 deletions
diff --git a/etherpad/src/main.js b/etherpad/src/main.js
index b77d5ee..6d99e16 100644
--- a/etherpad/src/main.js
+++ b/etherpad/src/main.js
@@ -287,14 +287,6 @@ 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) {