summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session/Session_driver.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
committerFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
commitb4841bc83374052c46fbc3f4a223484199546fd8 (patch)
tree385733a716c03b576335e5bb98361c13e92138f3 /system/libraries/Session/Session_driver.php
parent98f7c65dddf0667f1a0462e08be9e6273ce658fb (diff)
parentc576995304fc3609cca0b7b92d1b2cd611ec82f5 (diff)
Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Session/Session_driver.php')
-rw-r--r--system/libraries/Session/Session_driver.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php
index 2fe30b8a2..14ebdb09f 100644
--- a/system/libraries/Session/Session_driver.php
+++ b/system/libraries/Session/Session_driver.php
@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
- * @license http://opensource.org/licenses/MIT MIT License
+ * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
@@ -115,13 +115,13 @@ abstract class CI_Session_driver implements SessionHandlerInterface {
/**
* PHP 5.x validate ID
*
- * Enforces session.use_strict_mode on PHP 5.x (7+ does it by itself)
+ * Enforces session.use_strict_mode
*
* @return void
*/
public function php5_validate_id()
{
- if (PHP_VERSION_ID < 70000 && isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateId($_COOKIE[$this->_config['cookie_name']]))
+ if (isset($_COOKIE[$this->_config['cookie_name']]) && ! $this->validateSessionId($_COOKIE[$this->_config['cookie_name']]))
{
unset($_COOKIE[$this->_config['cookie_name']]);
}