aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-26 11:03:36 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-03-26 11:03:36 +0100
commitc8f0cbab5a994aadfaa9c984bb9959ca872fe781 (patch)
tree35951779da0a43feeaa6f40df2c8cddb7d0f795f /lib
parent40b77eb97ae7c3662a820060e021f36c3979c5e8 (diff)
parent630b7edc546778f9454e469e637df25055f7d4ad (diff)
downloadnextcloud-server-c8f0cbab5a994aadfaa9c984bb9959ca872fe781.tar.gz
nextcloud-server-c8f0cbab5a994aadfaa9c984bb9959ca872fe781.zip
Merge pull request #15194 from owncloud/fix-15146
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) {