Revert "Fix bug where session was destoryed with window close (#7251)"

This reverts commit 32fac136db.
pull/7317/head
Aleksander Machniak 5 years ago
parent 4a5efe09f9
commit 15ee34a438

@ -33,7 +33,6 @@ CHANGELOG Roundcube Webmail
- Fix handling keyservers configured with protocol prefix (#7295) - Fix handling keyservers configured with protocol prefix (#7295)
- Markasjunk: Fix marking as spam/ham on moving messages with Move menu (#7189) - Markasjunk: Fix marking as spam/ham on moving messages with Move menu (#7189)
- Markasjunk: Fix bug where moving to Junk was failing on messages selected with Select > All (#7206) - Markasjunk: Fix bug where moving to Junk was failing on messages selected with Select > All (#7206)
- Fix bug where session was destoryed with window close (#7251)
- Fix so imap error message is displayed to the user on folder create/update (#7245) - Fix so imap error message is displayed to the user on folder create/update (#7245)
- Fix bug where a special folder couldn't be created if a special-use flag is not supported (#7147) - Fix bug where a special folder couldn't be created if a special-use flag is not supported (#7147)

@ -463,7 +463,8 @@ class rcube
ini_set('session.gc_maxlifetime', $lifetime * 2); ini_set('session.gc_maxlifetime', $lifetime * 2);
} }
ini_set('session.cookie_lifetime', $lifetime); // set session cookie lifetime so it never expires (#5961)
ini_set('session.cookie_lifetime', 0);
ini_set('session.cookie_secure', $is_secure); ini_set('session.cookie_secure', $is_secure);
ini_set('session.name', $sess_name ?: 'roundcube_sessid'); ini_set('session.name', $sess_name ?: 'roundcube_sessid');
ini_set('session.use_cookies', 1); ini_set('session.use_cookies', 1);

@ -694,7 +694,7 @@ abstract class rcube_session
public function set_auth_cookie() public function set_auth_cookie()
{ {
$this->cookie = $this->_mkcookie($this->now); $this->cookie = $this->_mkcookie($this->now);
rcube_utils::setcookie($this->cookiename, $this->cookie, time() + $this->lifetime); rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
$_COOKIE[$this->cookiename] = $this->cookie; $_COOKIE[$this->cookiename] = $this->cookie;
} }

Loading…
Cancel
Save