diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-09 16:24:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 16:24:33 +0300 |
| commit | a108a7c3d012c011ac58c1f4a9d9e650f57af052 (patch) | |
| tree | f9230a30d6d84a469e134404fb55d2bb3341332c | |
| parent | 89c811335ea87e08e460603ac7fbb56e55464a8a (diff) | |
| parent | bcc0e5c7e0ba9715df1ad5b78cb760722112df4e (diff) | |
Merge pull request #15473 from nextcloud/backport/15468/stable14
[stable14] Remove recommendation for opcache on CLI
| -rw-r--r-- | core/js/setupchecks.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 2 | ||||
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 5061b769d00..e59cca62674 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -252,7 +252,7 @@ { docLink: data.phpOpcacheDocumentation, } - ) + "<pre><code>opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>", + ) + "<pre><code>opcache.enable=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>", type: OC.SetupChecks.MESSAGE_TYPE_INFO }); } diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 7ddaffc1594..c9598d4747a 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -671,7 +671,7 @@ describe('OC.SetupChecks tests', function() { async.done(function( data, s, x ){ expect(data).toEqual([{ - msg: 'The PHP OPcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer noopener">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:' + "<pre><code>opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>", + msg: 'The PHP OPcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer noopener">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:' + "<pre><code>opcache.enable=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>", type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done(); diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 224c0cb30d3..c41cea6c2e0 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -411,10 +411,6 @@ Raw output return false; } - if(!$iniWrapper->getBool('opcache.enable_cli')) { - return false; - } - if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) { return false; } |