valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of KKozlowski/tt-rss into master

This commit is contained in:
fox 2017-07-17 04:31:14 +00:00 committed by Gogs
parent 9fa3ae09a6 e234ac8dcb
commit 2cdef24888
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@ -1782,7 +1782,7 @@
} }
function is_server_https() { 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() { function is_prefix_https() {

2
include/sessions.php
View File

@ -12,7 +12,7 @@
$session_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400)); $session_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400));
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; $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"; $session_name .= "_ssl";
ini_set("session.cookie_secure", true); ini_set("session.cookie_secure", true);
} }

2
install/index.php
View File

@ -180,7 +180,7 @@
} }
function is_server_https() { 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() { function make_self_url_path() {