summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2019-01-08 16:55:37 +0100
committerAndrey Andreev <narf@devilix.net>2019-01-08 16:55:37 +0100
commit7ec458b45316b9f270e1e03de498244f71c605ea (patch)
treea110bf9c71b49a69beec49d1874f423375cd0fd1 /system/libraries
parent67563c64025085e61598a83fef3e25bef38b32c4 (diff)
parent12ee9843877bf80159d1d89a0e3a4f170e902725 (diff)
Merge branch '3.1-stable' into develop
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Session/Session_driver.php4
-rw-r--r--system/libraries/Session/drivers/Session_database_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_files_driver.php6
-rw-r--r--system/libraries/Session/drivers/Session_memcached_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_redis_driver.php2
-rw-r--r--system/libraries/Xmlrpc.php2
6 files changed, 10 insertions, 8 deletions
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php
index ed0f0cd82..14ebdb09f 100644
--- a/system/libraries/Session/Session_driver.php
+++ b/system/libraries/Session/Session_driver.php
@@ -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']]);
}
diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php
index c626093f9..734fe624f 100644
--- a/system/libraries/Session/drivers/Session_database_driver.php
+++ b/system/libraries/Session/drivers/Session_database_driver.php
@@ -353,7 +353,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
* @param string $id
* @return bool
*/
- public function validateId($id)
+ public function validateSessionId($id)
{
// Prevent previous QB calls from messing with our queries
$this->_db->reset_query();
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php
index a2d25cc8f..467059434 100644
--- a/system/libraries/Session/drivers/Session_files_driver.php
+++ b/system/libraries/Session/drivers/Session_files_driver.php
@@ -402,9 +402,11 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle
* @param string $id
* @return bool
*/
- public function validateId($id)
+ public function validateSessionId($id)
{
- return is_file($this->_file_path.$id);
+ $result = is_file($this->_file_path.$id);
+ clearstatcache(TRUE, $this->_file_path.$id);
+ return $result;
}
// --------------------------------------------------------------------
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index 7e026ad52..ab54f029f 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -303,7 +303,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa
* @param string $id
* @return bool
*/
- public function validateId($id)
+ public function validateSessionId($id)
{
$this->_memcached->get($this->_key_prefix.$id);
return ($this->_memcached->getResultCode() === Memcached::RES_SUCCESS);
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
index 6020a9ef9..07511e555 100644
--- a/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -347,7 +347,7 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle
* @param string $id
* @return bool
*/
- public function validateId($id)
+ public function validateSessionId($id)
{
return (bool) $this->_redis->exists($this->_key_prefix.$id);
}
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index ffe0813f7..4e8c303c7 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1211,7 +1211,7 @@ class XML_RPC_Message extends CI_Xmlrpc
{
echo '<pre>';
- if (count($this->xh[$pname]['headers'] > 0))
+ if (count($this->xh[$pname]['headers']) > 0)
{
echo "---HEADERS---\n";
foreach ($this->xh[$pname]['headers'] as $header)