From 34e6dec7f48b736296c203b2f5109425ab1542c3 Mon Sep 17 00:00:00 2001 From: Markus Frei Date: Mon, 31 May 2021 13:38:17 +0200 Subject: [PATCH 1/2] fixed #27094 Signed-off-by: Markus Frei --- .../lib/Controller/CheckSetupController.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 367b631706..049cef1c16 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -23,6 +23,7 @@ * @author Sylvia van Os * @author timm2k * @author Timo Förster + * @author Markus Frei * * @license AGPL-3.0 * @@ -433,19 +434,31 @@ Raw output return false; } + // `opcache.save_comments=1` is a must, because disabling this configuration directive breaks + // Nextcloud - it relies on comment parsing for annotations. if (!$this->iniGetWrapper->getBool('opcache.save_comments')) { return false; } - if ($this->iniGetWrapper->getNumeric('opcache.max_accelerated_files') < 10000) { + // from php.net: + // The maximum number of keys (and therefore scripts) in the OPcache hash table. The actual + // value used will be the first number in the set of prime numbers { 223, 463, 983, 1979, + // 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 } that is greater than + // or equal to the configured value. The minimum value is 200. The maximum value is 1000000. + // Values outside of this range are clamped to the permissible range. + if ($this->iniGetWrapper->getNumeric('opcache.max_accelerated_files') <= 7963) { return false; } + // There were some mentions of specific apps capable of throwing the memory requirement here + // upwards toward/on/above 128 MB. Given that it is the suggested value. if ($this->iniGetWrapper->getNumeric('opcache.memory_consumption') < 128) { return false; } - if ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') < 8) { + // 8 MB memory used to store interned strings is not enough (if you configure "8", you get + // 6 MB Buffer Size). 16 MB seem to be enough (you will get 12 MB Buffer Size) + if ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') < 16) { return false; } From 2c6758836762dd15053dc8eddca1be7dbea95f88 Mon Sep 17 00:00:00 2001 From: Markus Frei Date: Wed, 2 Jun 2021 08:34:55 +0200 Subject: [PATCH 2/2] fixed php-cs-fixer warnings --- .../lib/Controller/CheckSetupController.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 049cef1c16..37d284fdb3 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -434,30 +434,30 @@ Raw output return false; } - // `opcache.save_comments=1` is a must, because disabling this configuration directive breaks - // Nextcloud - it relies on comment parsing for annotations. + // `opcache.save_comments=1` is a must, because disabling this configuration directive breaks + // Nextcloud - it relies on comment parsing for annotations. if (!$this->iniGetWrapper->getBool('opcache.save_comments')) { return false; } - // from php.net: - // The maximum number of keys (and therefore scripts) in the OPcache hash table. The actual - // value used will be the first number in the set of prime numbers { 223, 463, 983, 1979, - // 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 } that is greater than - // or equal to the configured value. The minimum value is 200. The maximum value is 1000000. - // Values outside of this range are clamped to the permissible range. + // from php.net: + // The maximum number of keys (and therefore scripts) in the OPcache hash table. The actual + // value used will be the first number in the set of prime numbers { 223, 463, 983, 1979, + // 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 } that is greater than + // or equal to the configured value. The minimum value is 200. The maximum value is 1000000. + // Values outside of this range are clamped to the permissible range. if ($this->iniGetWrapper->getNumeric('opcache.max_accelerated_files') <= 7963) { return false; } - // There were some mentions of specific apps capable of throwing the memory requirement here - // upwards toward/on/above 128 MB. Given that it is the suggested value. + // There were some mentions of specific apps capable of throwing the memory requirement here + // upwards toward/on/above 128 MB. Given that it is the suggested value. if ($this->iniGetWrapper->getNumeric('opcache.memory_consumption') < 128) { return false; } - // 8 MB memory used to store interned strings is not enough (if you configure "8", you get - // 6 MB Buffer Size). 16 MB seem to be enough (you will get 12 MB Buffer Size) + // 8 MB memory used to store interned strings is not enough (if you configure "8", you get + // 6 MB Buffer Size). 16 MB seem to be enough (you will get 12 MB Buffer Size) if ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') < 16) { return false; }