From 3ea30ef7ebb7aa6180a47db29575055dd97cff62 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Wed, 04 Nov 2009 02:22:17 -0500 Subject: [PATCH] - fix HTTPS checking (#1486273) --- program/include/main.inc | 2 +- program/include/rcmail.php | 2 +- program/include/iniset.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php index 1332c8d..2600a39 100755 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -51,8 +51,8 @@ } ini_set('error_reporting', E_ALL&~E_NOTICE); -if (isset($_SERVER['HTTPS'])) { - ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0); +if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') { + ini_set('session.cookie_secure', 1); } else { ini_set('session.cookie_secure', 0); } diff --git a/program/include/main.inc b/program/include/main.inc index aa0d3fa..258f719 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1410,7 +1410,7 @@ { global $RCMAIL; - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') + if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') return true; if ($port && $_SERVER['SERVER_PORT'] == $port) return true; diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 763c708..2c002b1 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1063,7 +1063,7 @@ { $cookie = session_get_cookie_params(); setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'], - ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))); + rcube_https_check()); } } -- Gitblit v1.9.1