mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24503 from nextcloud/backport/24499/stable19 

[stable19] Harden setup check for TLS version if host is not reachable
This commit is contained in:
Christoph Wurst 2020-12-02 16:06:08 +01:00 committed by GitHub
parent 379bb17a48 2ff7bc51a7
commit 32b7a0e13f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/settings/lib/Controller/CheckSetupController.php
View File

@ -253,6 +253,9 @@ class CheckSetupController extends Controller {
if ($e->getResponse()->getStatusCode() === 400) { if ($e->getResponse()->getStatusCode() === 400) {
return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]); return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
} }
} catch (\Exception $e) {
$this->logger->logException($e, ['app' => 'settings', 'level' => \OCP\ILogger::WARN]);
return $this->l10n->t('Could not determine if TLS version of cURL is outdated or not because an error happened during the HTTPS request against https://nextcloud.com. Please check the nextcloud log file for more details.');
} }
} }