Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-10-02 17:17:56 +0300
committerMorris Jobke <hey@morrisjobke.de>2015-10-06 09:51:47 +0300
commitb51996540889b29b3b1d2bc118f652c7b942404b (patch)
tree9c324a8f8d93c27b4ee4f72a220ff3989813506f /settings/controller
parent3ff60cc2e3a47efd9796b5376694743c168efeb3 (diff)
[admin] check for correct PHP memcached module
Diffstat (limited to 'settings/controller')
-rw-r--r--settings/controller/checksetupcontroller.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index ca4eb255f6b..34fe824bc97 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -211,6 +211,23 @@ class CheckSetupController extends Controller {
}
/**
+ * Checks if the correct memcache module for PHP is installed. Only
+ * fails if memcached is configured and the working module is not installed.
+ *
+ * @return bool
+ */
+ private function isCorrectMemcachedPHPModuleInstalled() {
+ if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+ return true;
+ }
+
+ // there are two different memcached modules for PHP
+ // we only support memcached and not memcache
+ // https://code.google.com/p/memcached/wiki/PHPClientComparison
+ return !extension_loaded('memcached') && extension_loaded('memcache');
+ }
+
+ /**
* @return DataResponse
*/
public function check() {
@@ -226,6 +243,7 @@ class CheckSetupController extends Controller {
'phpSupported' => $this->isPhpSupported(),
'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+ 'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled()
]
);
}