From c275beecebb96a914616e39ec61a22e4597358ec Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Fri, 28 Sep 2018 22:32:19 +0200 Subject: Allow url without / for overwrite.cli.url Signed-off-by: Daniel Kesselberg --- lib/private/Setup.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/private') diff --git a/lib/private/Setup.php b/lib/private/Setup.php index d5ccde6bba3..9f5403b8318 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -445,11 +445,10 @@ class Setup { if ($webRoot === '') { throw new InvalidArgumentException('overwrite.cli.url is empty'); } - $webRoot = parse_url($webRoot, PHP_URL_PATH); - if ($webRoot === null) { + if (!filter_var($webRoot, FILTER_VALIDATE_URL)) { throw new InvalidArgumentException('invalid value for overwrite.cli.url'); } - $webRoot = rtrim($webRoot, '/'); + $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/'); } else { $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; } -- cgit v1.2.3