Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

RedisEngine: authenticate connection if 'password' is set

  • Loading branch information...
commit 7d844866f0eefbc29dd9417d688715b07fbf3d5f 1 parent 0196c6f
@rchavik rchavik authored
View
2  lib/Cake/Cache/Cache.php
@@ -103,7 +103,7 @@ class Cache {
* - `path` Used by FileCache. Path to where cachefiles should be saved.
* - `lock` Used by FileCache. Should files be locked before writing to them?
* - `user` Used by Xcache. Username for XCache
- * - `password` Used by Xcache. Password for XCache
+ * - `password` Used by Xcache/Redis. Password for XCache/Redis
*
* @see app/Config/core.php for configuration settings
* @param string $name Name of the configuration
View
4 lib/Cake/Cache/Engine/RedisEngine.php
@@ -62,6 +62,7 @@ public function init($settings = array()) {
'prefix' => null,
'server' => '127.0.0.1',
'port' => 6379,
+ 'password' => false,
'timeout' => 0,
'persistent' => true
), $settings)
@@ -87,6 +88,9 @@ protected function _connect() {
} catch (RedisException $e) {
return false;
}
+ if ($return && $this->settings['password']) {
+ $return = $this->_Redis->auth($this->settings['password']);
+ }
return $return;
}
View
3  lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
@@ -73,7 +73,8 @@ public function testSettings() {
'server' => '127.0.0.1',
'port' => 6379,
'timeout' => 0,
- 'persistent' => true
+ 'persistent' => true,
+ 'password' => false,
);
$this->assertEquals($expecting, $settings);
}
Please sign in to comment.
Something went wrong with that request. Please try again.