Merge branch 'magicbug:dev' into dev

pull/2533/head
HB9HIL 2023-10-02 21:17:20 +02:00 zatwierdzone przez GitHub
commit cc4b8d1e8a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 20 dodań i 6 usunięć

Wyświetl plik

@ -139,14 +139,28 @@ abstract class CI_Session_driver implements SessionHandlerInterface {
*/ */
protected function _cookie_destroy() protected function _cookie_destroy()
{ {
if ( ! is_php('7.3'))
{
$header = 'Set-Cookie: '.$this->_config['cookie_name'].'=';
$header .= '; Expires='.gmdate('D, d-M-Y H:i:s T', 1).'; Max-Age=-1';
$header .= '; Path='.$this->_config['cookie_path'];
$header .= ($this->_config['cookie_domain'] !== '' ? '; Domain='.$this->_config['cookie_domain'] : '');
$header .= ($this->_config['cookie_secure'] ? '; Secure' : '').'; HttpOnly; SameSite='.$this->_config['cookie_samesite'];
header($header);
return;
}
return setcookie( return setcookie(
$this->_config['cookie_name'], $this->_config['cookie_name'],
NULL, '',
1, array(
$this->_config['cookie_path'], 'expires' => 1,
$this->_config['cookie_domain'], 'path' => $this->_config['cookie_path'],
$this->_config['cookie_secure'], 'domain' => $this->_config['cookie_domain'],
TRUE 'secure' => $this->_config['cookie_secure'],
'httponly' => TRUE,
'samesite' => $this->_config['cookie_samesite']
)
); );
} }