Fix #3823

bcit-ci · Apr 30, 2015 · 73b9e85 · 73b9e85
1 parent af85f33
commit 73b9e85
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -322,7 +322,7 @@ protected function _get_lock($session_id)
 			$this->_lock_key = $lock_key;
 			break;
 		}
-		while ($attempt++ < 30);
+		while (++$attempt < 30);
 
 		if ($attempt === 30)
 		{

diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -336,7 +336,7 @@ protected function _get_lock($session_id)
 			$this->_lock_key = $lock_key;
 			break;
 		}
-		while ($attempt++ < 30);
+		while (++$attempt < 30);
 
 		if ($attempt === 30)
 		{

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -26,6 +26,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3787) - :doc:`FTP Library <libraries/ftp>` method ``delete_dir()`` failed when the target has subdirectories.
 -  Fixed a bug (#3801) - :doc:`Output Library <libraries/output>` method ``_display_cache()`` incorrectly looked for the last modified time of a directory instead of the cache file.
 -  Fixed a bug (#3816) - :doc:`Form Validation Library <libraries/form_validation>` treated empty string values as non-existing ones.
+-  Fixed a bug (#3823) - :doc:`Session Library <libraries/sessions>` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds.
 
 Version 3.0.0
 =============