summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-01-27 04:25:31 -0800
committerMorris Jobke <morris.jobke@gmail.com>2014-01-27 04:25:31 -0800
commit6ee1250d276d524d2a3e4f22f259a5576150eac4 (patch)
tree3861b43ff4cd22e7ab537cf114738105ccdae6e5 /lib
parent0a1708ba11b5380f9730e8bc0d65ed79a68a7995 (diff)
parent2f8ebd03b011b705883bf9666b1bdaafb971f110 (diff)
downloadnextcloud-server-6ee1250d276d524d2a3e4f22f259a5576150eac4.tar.gz
nextcloud-server-6ee1250d276d524d2a3e4f22f259a5576150eac4.zip
Merge pull request #6933 from seberm/master
Add check for apc.enabled option
Diffstat (limited to 'lib')
-rw-r--r--lib/private/memcache/apc.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/memcache/apc.php b/lib/private/memcache/apc.php
index 575ee4427db..e995cbc526e 100644
--- a/lib/private/memcache/apc.php
+++ b/lib/private/memcache/apc.php
@@ -50,6 +50,8 @@ class APC extends Cache {
static public function isAvailable() {
if (!extension_loaded('apc')) {
return false;
+ } elseif (!ini_get('apc.enabled')) {
+ return false;
} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
return false;
} else {