summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2013-12-30 22:19:36 +0000
committerGreg Roach <fisharebest@gmail.com>2013-12-30 22:19:36 +0000
commit3ae6c2b3ebbe9651c0580cc16546354428c890f9 (patch)
tree2769119cd9e068f3ce01ab8c707f312e3e6b1c8f
parent2bddc3d8075634cb827c389b0828181e4c20d101 (diff)
downloadwebtrees-3ae6c2b3ebbe9651c0580cc16546354428c890f9.tar.gz
webtrees-3ae6c2b3ebbe9651c0580cc16546354428c890f9.tar.bz2
webtrees-3ae6c2b3ebbe9651c0580cc16546354428c890f9.zip
More accurate(?) test for HTTPS:
-rwxr-xr-xincludes/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/session.php b/includes/session.php
index 56db60ce2a..c58c2be6e8 100755
--- a/includes/session.php
+++ b/includes/session.php
@@ -165,7 +165,7 @@ if (!ini_get('date.timezone')) {
// TODO: we ought to generate this dynamically, but lots of code currently relies on this global
$QUERY_STRING=isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-$https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off';
+$https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off';
define('WT_SERVER_NAME',
($https ? 'https://' : 'http://').
(empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']).