RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2364 from xisi/dev-memcache-sasl-support

Browse Source 
Memcache SASL fixes
This commit is contained in:
Sebastian Grewe 2014-11-18 12:01:51 +01:00
commit 011916c439
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/admin_checks.php
View File

@ -34,7 +34,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
}
if (class_exists('Memcached')) {
$memcache_test = @new Memcached();
if ($config['memcache']['sasl']) {
if ($config['memcache']['sasl'] === true) {
$memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
$memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
}

4
include/classes/statscache.class.php
View File

@ -19,9 +19,9 @@ class StatsCache {
require_once(CLASS_DIR . '/memcached.class.php');
}
$this->cache = new Memcached();
if ($config['memcache']['sasl']) {
if ($config['memcache']['sasl'] === true) {
$this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
$this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']) or die("failed!");
$this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
}
}
}