diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-04-02 12:11:33 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-04-02 12:11:33 +0200 |
| commit | 8e4b49c382817723f4532b39aca06a7d41383f00 (patch) | |
| tree | 60ee89a910eaca37ac6caa71222c2fe136561923 /program/lib | |
| parent | f9f700a4e2a1d2820160596aef7833952e0adc21 (diff) | |
Fix session issues with use_https=true (#1488986)
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 3ae511e1e..77da83d8e 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); |