diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-12-02 18:13:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 18:13:58 +0300 |
| commit | 9fa917c653252f0c8ceefe72f6a64148e50d92e8 (patch) | |
| tree | 101f38992b2faff7a97e63985d6c70347008c2ba | |
| parent | 670fa4875e9f9c4026cdce662eff4e13da9726cb (diff) | |
| parent | 233bd7b5eca926df12f3f871ff876d83f393af8e (diff) | |
Merge pull request #24504 from nextcloud/backport/24499/stable18
[stable18] 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 8033d90aae6..33086a9efa6 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -251,6 +251,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.'); } } |