diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-04-09 16:41:09 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-04-09 16:41:09 +0200 |
| commit | 5add0fc9e508ae415878bc84179c1791e749008c (patch) | |
| tree | ea9d94ee482a80b77771a7285f8fe9f64a7c7552 | |
| parent | fd363f224d7886eb686434d7a835eaa49183d8e6 (diff) | |
| parent | ebfc48a9ee05dbd96a372894ab65f6287fe6c398 (diff) | |
Merge pull request #3744 from ftwbzhao/develop
[ci skip] Cache/Redis authentication failure handling
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_redis.php | 6 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php index 114c32983..b940b76cb 100644 --- a/system/libraries/Cache/drivers/Cache_redis.php +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -302,7 +302,11 @@ class CI_Cache_redis extends CI_Driver if (isset($config['password'])) { - $this->_redis->auth($config['password']); + if ( ! $this->_redis->auth($config['password'])) + { + log_message('debug', 'Cache: Redis authentication failed.'); + return FALSE; + } } // Initialize the index of serialized values. diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 8fa4d1ef1..04a0aa55a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -15,6 +15,7 @@ Bug fixes for 3.0.1 ------------------- - Fixed a bug (#3733) - Autoloading of libraries with aliases didn't work, although it was advertised to. +- Fixed a bug (#3744) - Redis :doc:`Caching <libraries/caching>` driver didn't handle authentication failures properly. Version 3.0.0 ============= |