upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons-for-ipv6

Browse source 
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
This commit is contained in:
Morris Jobke 2017-11-08 10:33:35 +01:00 committed by GitHub
commit 7e92bcdbb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/Setup.php
View file

@ -294,10 +294,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(count($error) != 0) {
return $error;
}
@ -413,18 +409,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() {
\OC::$server->getJobList()->add('\OC\Authentication\Token\DefaultTokenCleanupJob');
}