summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-02 12:11:33 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-02 12:12:05 +0200
commitd74b4106976a776c28c73fa8d6f65279b264d2ec (patch)
tree88808c83b3959a38776c2754b953cd5cede1bb57 /program/lib
parentf3739dc7296fc8d29d3ce7243411cd8873ea49a4 (diff)
Fix session issues with use_https=true (#1488986)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index a914ae65a..b2595668e 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -405,6 +405,7 @@ class rcube
$sess_domain = $this->config->get('session_domain');
$sess_path = $this->config->get('session_path');
$lifetime = $this->config->get('session_lifetime', 0) * 60;
+ $is_secure = $this->config->get('use_https') || rcube_utils::https_check();
// set session domain
if ($sess_domain) {
@@ -419,7 +420,7 @@ class rcube
ini_set('session.gc_maxlifetime', $lifetime * 2);
}
- ini_set('session.cookie_secure', rcube_utils::https_check());
+ ini_set('session.cookie_secure', $is_secure);
ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
ini_set('session.use_cookies', 1);
ini_set('session.use_only_cookies', 1);