diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-09 15:24:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 15:24:06 +0200 |
| commit | fd2d026adfe026d0e6163ca1e6cc2f2177d0a26d (patch) | |
| tree | c03ae5d23dc0b8245249af01d1987edcb8eb73e8 | |
| parent | 1df96e02cb0c994a83b24cb0958243297d50ab72 (diff) | |
| parent | 932830031b5c9f76ece85db517f5bce9df7e8be2 (diff) | |
| download | nextcloud-server-fd2d026adfe026d0e6163ca1e6cc2f2177d0a26d.tar.gz nextcloud-server-fd2d026adfe026d0e6163ca1e6cc2f2177d0a26d.zip | |
Merge pull request #15472 from nextcloud/backport/15468/stable15
[stable15] 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 03f109c8725..514494ab59c 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -332,7 +332,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 8ef574f54d3..dbca5429727 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -789,7 +789,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 70dfadd196f..718feb16f7a 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -412,10 +412,6 @@ Raw output return false; } - if(!$iniWrapper->getBool('opcache.enable_cli')) { - return false; - } - if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) { return false; } |