wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4378 from owncloud/fixing-3417-master

Browse source 
Don't use xcache in case admin auth is enabled
This commit is contained in:
Thomas Müller 2013-12-19 03:24:37 -08:00
commit 9b18a4fd87
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/private/memcache/xcache.php
View file

@ -8,9 +8,13 @@
namespace OC\Memcache; namespace OC\Memcache;
/**
* See http://xcache.lighttpd.net/wiki/XcacheApi for provided constants and
* functions etc.
*/
class XCache extends Cache { class XCache extends Cache {
/** /**
* entries in XCache gets namespaced to prevent collisions between owncloud instances and users * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users
*/ */
protected function getNameSpace() { protected function getNameSpace() {
return $this->prefix; return $this->prefix;
@ -37,7 +41,12 @@ class XCache extends Cache {
} }
public function clear($prefix='') { public function clear($prefix='') {
xcache_unset_by_prefix($this->getNamespace().$prefix); if (function_exists('xcache_unset_by_prefix')) {
return xcache_unset_by_prefix($this->getNamespace().$prefix);
} else {
// Since we can not clear by prefix, we just clear the whole cache.
xcache_clear_cache(\XC_TYPE_VAR, 0);
}
return true; return true;
} }
@ -48,6 +57,12 @@ class XCache extends Cache {
if (\OC::$CLI) { if (\OC::$CLI) {
return false; return false;
} }
if (!function_exists('xcache_unset_by_prefix') && ini_get('xcache.admin.enable_auth')) {
// We do not want to use XCache if we can not clear it without
// using the administration function xcache_clear_cache()
// AND administration functions are password-protected.
return false;
}
$var_size = (int) ini_get('xcache.var_size'); $var_size = (int) ini_get('xcache.var_size');
if (!$var_size) { if (!$var_size) {
return false; return false;
@ -55,10 +70,3 @@ class XCache extends Cache {
return true; return true;
} }
} }
if(!function_exists('xcache_unset_by_prefix')) {
function xcache_unset_by_prefix($prefix) {
// Since we can't clear targetted cache, we'll clear all. :(
xcache_clear_cache(\XC_TYPE_VAR, 0);
}
}

6
lib/private/util.php
View file

@ -1085,7 +1085,11 @@ class OC_Util {
} }
// XCache // XCache
if (function_exists('xcache_clear_cache')) { if (function_exists('xcache_clear_cache')) {
xcache_clear_cache(XC_TYPE_VAR, 0); if (ini_get('xcache.admin.enable_auth')) {
OC_Log::write('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', \OC_Log::WARN);
} else {
xcache_clear_cache(XC_TYPE_PHP, 0);
}
} }
// Opcache (PHP >= 5.5) // Opcache (PHP >= 5.5)
if (function_exists('opcache_reset')) { if (function_exists('opcache_reset')) {