diff options
author | fox <[email protected]> | 2017-07-17 04:31:14 +0000 |
---|---|---|
committer | Gogs <[email protected]> | 2017-07-17 04:31:14 +0000 |
commit | 2cdef2488821c27acb6f67cad82999fe4fdb8a88 (patch) | |
tree | fc536b1228b5c671fb0eb420fb2e2b4431b29b1a | |
parent | 9fa3ae09a6fe791805ee63e87fcac970e3f037ed (diff) | |
parent | e234ac8dcb2fa73bc573fea1e809ef45b3392ca7 (diff) |
Merge branch 'master' of KKozlowski/tt-rss into master
-rw-r--r-- | include/functions.php | 2 | ||||
-rw-r--r-- | include/sessions.php | 2 | ||||
-rwxr-xr-x | install/index.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index ad6f2689c..ba5a699b9 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1782,7 +1782,7 @@ } function is_server_https() { - return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; + return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; } function is_prefix_https() { diff --git a/include/sessions.php b/include/sessions.php index 0690ab7ed..3d6e6e2c6 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -12,7 +12,7 @@ $session_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400)); $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; - if (@$_SERVER['HTTPS'] == "on") { + if ((!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || @$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') { $session_name .= "_ssl"; ini_set("session.cookie_secure", true); } diff --git a/install/index.php b/install/index.php index 4239f5893..883573001 100755 --- a/install/index.php +++ b/install/index.php @@ -180,7 +180,7 @@ } function is_server_https() { - return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; + return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; } function make_self_url_path() { |