summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-08 10:47:29 +0100
committerMorris Jobke <hey@morrisjobke.de>2017-11-08 10:47:35 +0100
commit732c951ae166bc4e3622cbbaaf346e2ff44672d6 (patch)
tree909ab924b305f555f1cdf5f54dc78b8544f30263 /lib
parent79c9439c50729ab2880c21876ed0a775a6b85a5d (diff)
downloadnextcloud-server-732c951ae166bc4e3622cbbaaf346e2ff44672d6.tar.gz
nextcloud-server-732c951ae166bc4e3622cbbaaf346e2ff44672d6.zip
Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb303fc9b088b8a6837490042a1540dc6. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Setup.php16
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index e1863a5814c..8214db2d4ef 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -295,10 +295,6 @@ class Setup {
$error[] = $l->t("Can't create or write into the data directory %s", array($dataDir));
}
- if (!$this->validateDatabaseHost($options['dbhost'])) {
- $error[] = $l->t('Given database host is invalid and must not contain the port: %s', [$options['dbhost']]);
- }
-
if (!empty($error)) {
return $error;
}
@@ -416,18 +412,6 @@ class Setup {
return $error;
}
- /**
- * @param string $host
- * @return bool
- */
- protected function validateDatabaseHost($host) {
- if (strpos($host, ':') === false) {
- return true;
- }
-
- return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
- }
-
public static function installBackgroundJobs() {
$jobList = \OC::$server->getJobList();
$jobList->add(DefaultTokenCleanupJob::class);