summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session/Session.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2022-04-10 11:46:21 +0200
committerFlorian Pritz <bluewind@xinu.at>2022-04-10 11:46:21 +0200
commitb401c4e13863143b38b8848595566801fcc1527f (patch)
treec6eae5ce18f519480ead73a16029dbf3c8e993aa /system/libraries/Session/Session.php
parent3deea564901d69109ddd6f757ccff84e6f113997 (diff)
parent45576ef6e62b5ff59da67f1697ee8c57809c7719 (diff)
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Diffstat (limited to 'system/libraries/Session/Session.php')
-rw-r--r--system/libraries/Session/Session.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 8d3ba2857..a211ce31b 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -182,7 +182,7 @@ class CI_Session {
if ( ! $this->_config['cookie_secure'] && $this->_config['cookie_samesite'] === 'None')
{
- log_message('error', 'Session:', $this->_config['cookie_name'].' cookie sent with SameSite=None, but without Secure attribute.');
+ log_message('error', "Session: '".$this->_config['cookie_name']."' cookie sent with SameSite=None, but without Secure attribute.'");
}
}
@@ -207,6 +207,8 @@ class CI_Session {
{
// PHP 5.4 compatibility
interface_exists('SessionHandlerInterface', FALSE) OR require_once(BASEPATH.'libraries/Session/SessionHandlerInterface.php');
+ // PHP 7 compatibility
+ interface_exists('SessionUpdateTimestampHandlerInterface', FALSE) OR require_once(BASEPATH.'libraries/Session/SessionUpdateTimestampHandlerInterface.php');
require_once(BASEPATH.'libraries/Session/CI_Session_driver_interface.php');
$wrapper = is_php('8.0') ? 'PHP8SessionWrapper' : 'OldSessionWrapper';