Skip to content

Commit e5a5d79

Browse files
committed
Merge pull request #2363 from xisi/dev-memcache-sasl-support
Preliminary support for Memcache SASL authentication
2 parents 99639bb + 2a52042 commit e5a5d79

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

include/admin_checks.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
}
3535
if (class_exists('Memcached')) {
3636
$memcache_test = @new Memcached();
37+
if ($config['memcache']['sasl']) {
38+
$memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
39+
$memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
40+
}
3741
$memcache_test_add = @$memcache_test->addServer($config['memcache']['host'], $config['memcache']['port']);
3842
$randmctv = rand(5,10);
3943
$memcache_test_set = @$memcache_test->set('test_mpos_setval', $randmctv);

include/classes/statscache.class.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public function __construct($config, $debug) {
1919
require_once(CLASS_DIR . '/memcached.class.php');
2020
}
2121
$this->cache = new Memcached();
22+
if ($config['memcache']['sasl']) {
23+
$this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
24+
$this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']) or die("failed!");
25+
}
2226
}
2327
}
2428

include/config/global.inc.dist.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@
268268
$config['memcache']['expiration'] = 90;
269269
$config['memcache']['splay'] = 15;
270270
$config['memcache']['force']['contrib_shares'] = false;
271+
$config['memcache']['sasl'] = false;
272+
$config['memcache']['sasl']['username'] = '';
273+
$config['memcache']['sasl']['password'] = '';
271274

272275
/**
273276
* Cookies

0 commit comments

Comments
 (0)