diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-12-30 22:03:18 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-12-30 22:03:18 +0000 |
| commit | 2bddc3d8075634cb827c389b0828181e4c20d101 (patch) | |
| tree | 83b03d9ceaa977d6fa943ad8221fb2f5daa3d3dd | |
| parent | a8b37b398de0108b5cd30f2ca8903fa653e5969f (diff) | |
| download | webtrees-2bddc3d8075634cb827c389b0828181e4c20d101.tar.gz webtrees-2bddc3d8075634cb827c389b0828181e4c20d101.tar.bz2 webtrees-2bddc3d8075634cb827c389b0828181e4c20d101.zip | |
More accurate(?) test for HTTPS:
| -rwxr-xr-x | includes/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/session.php b/includes/session.php index edf6f5a3dc..56db60ce2a 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 = !empty($_SERVER['HTTPS']) && in_array($_SERVER['HTTPS'], array('1', 'on', 'On', 'ON')); +$https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'; define('WT_SERVER_NAME', ($https ? 'https://' : 'http://'). (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']). |