Merge pull request #24502 from nextcloud/backport/24499/stable20

[stable20] Harden setup check for TLS version if host is not reachable
nextcloud · Dec 2, 2020 · e8b284e · e8b284e
2 parents 2a0c0ea + 03956c5
commit e8b284e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -261,6 +261,9 @@ private function isUsedTlsLibOutdated() {
 				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.');
 			}
 		}