Merge branch 'event' into 1.0.x

[quix0rs-gnu-social.git] / lib / statusnet.php

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 6cabd3842e09f0da20c54e115a08c0f258d54154..4c2aacd8f7d229994e41e9be75d2fdafafa25878 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -396,7 +396,11 @@ class StatusNet
     static function isHTTPS()
     {
         // There are some exceptions to this; add them here!
-        return $_SERVER['HTTPS'];
+        if(empty($_SERVER['HTTPS'])) {
+            return false;
+        } else {
+            return $_SERVER['HTTPS'] !== 'off';
+        }
     }
 }