diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2024-07-04 13:08:26 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2024-07-04 13:08:31 +0200 |
| commit | fa55d97dded9ab3edcd9bb13be7a0afca275f6aa (patch) | |
| tree | 32e35bdeaf1897c5efcdc85d81b2f5be93232657 /apps/settings | |
| parent | 23cc6cf7ce98e87e2e247c29b7cc80d2a5f02393 (diff) | |
| download | nextcloud-server-fa55d97dded9ab3edcd9bb13be7a0afca275f6aa.tar.gz nextcloud-server-fa55d97dded9ab3edcd9bb13be7a0afca275f6aa.zip | |
fix(SetupCheck): jsm test shall not give up with first no-response
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/settings')
| -rw-r--r-- | apps/settings/lib/SetupChecks/JavaScriptModules.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/settings/lib/SetupChecks/JavaScriptModules.php b/apps/settings/lib/SetupChecks/JavaScriptModules.php index c1234a9ff15..446c4d9d8d7 100644 --- a/apps/settings/lib/SetupChecks/JavaScriptModules.php +++ b/apps/settings/lib/SetupChecks/JavaScriptModules.php @@ -61,6 +61,7 @@ class JavaScriptModules implements ISetupCheck { array_map(fn (string $host): string => $host . $testFile, $this->config->getSystemValue('trusted_domains', [])) ); + $gotResponse = false; foreach ($testURLs as $testURL) { try { $client = $this->clientService->newClient(); @@ -73,14 +74,17 @@ class JavaScriptModules implements ISetupCheck { 'allow_local_address' => true, ], ]); + $gotResponse = true; if (preg_match('/(text|application)\/javascript/i', $response->getHeader('Content-Type'))) { return SetupResult::success(); } } catch (\Throwable $e) { $this->logger->debug('Can not connect to local server for checking JavaScript modules support', ['exception' => $e, 'url' => $testURL]); - return SetupResult::warning($this->l10n->t('Could not check for JavaScript support. Please check manually if your webserver serves `.mjs` files using the JavaScript MIME type.')); } } + if (!$gotResponse) { + return SetupResult::warning($this->l10n->t('Could not check for JavaScript support. Please check manually if your webserver serves `.mjs` files using the JavaScript MIME type.')); + } return SetupResult::error($this->l10n->t('Your webserver does not serve `.mjs` files using the JavaScript MIME type. This will break some apps by preventing browsers from executing the JavaScript files. You should configure your webserver to serve `.mjs` files with either the `text/javascript` or `application/javascript` MIME type.')); } } |