summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-26 11:50:32 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-03-26 11:50:32 +0100
commit722faee4c66cb4cbf4ef6f026263bbd7d640c775 (patch)
tree47ebae01d5fe059ac65dec2753157560c523bb2a /lib
parentd04ad4be26f0f09297748cac23582083c364ea25 (diff)
parentba9446a1b860c8932fa22de09edadb4e04e94c30 (diff)
downloadnextcloud-server-722faee4c66cb4cbf4ef6f026263bbd7d640c775.tar.gz
nextcloud-server-722faee4c66cb4cbf4ef6f026263bbd7d640c775.zip
Merge pull request #15208 from owncloud/fix-15146-stable8
Do not use APCu when apc.enabled is Off.
Diffstat (limited to 'lib')
-rw-r--r--lib/private/memcache/apcu.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/memcache/apcu.php b/lib/private/memcache/apcu.php
index 1043690a361..410877e2eec 100644
--- a/lib/private/memcache/apcu.php
+++ b/lib/private/memcache/apcu.php
@@ -12,6 +12,8 @@ class APCu extends APC {
static public function isAvailable() {
if (!extension_loaded('apcu')) {
return false;
+ } elseif (!ini_get('apc.enabled')) {
+ return false;
} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
return false;
} elseif (version_compare(phpversion('apc'), '4.0.6') === -1) {