diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2020-12-02 14:24:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 14:24:43 +0100 |
| commit | 0da8221327dbce2bb6e2c9cf69bc21090299f37f (patch) | |
| tree | 38054f197f54e1f3b8b0eeb1b180494fff3966ae | |
| parent | d8b8c9895b1069b6baf7a914b01d0f68930d0acf (diff) | |
| parent | fe79a1ad3e23ece390f4f6b1f7655344f241a495 (diff) | |
| download | nextcloud-server-0da8221327dbce2bb6e2c9cf69bc21090299f37f.tar.gz nextcloud-server-0da8221327dbce2bb6e2c9cf69bc21090299f37f.zip | |
Merge pull request #24499 from nextcloud/fix/noid/harden-setup-checks
Harden setup check for TLS version if host is not reachable
| -rw-r--r-- | apps/settings/lib/Controller/CheckSetupController.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 6984b0f5aea..7929e9c3962 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -262,6 +262,9 @@ class CheckSetupController extends Controller { 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]); } + } 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.'); } } |