diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2024-06-25 10:24:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 10:24:01 +0200 |
| commit | 9496ce6c7a35f5a6d151b78d78a45b1c900b3b2a (patch) | |
| tree | 4d093c7fbc32f77aba6637a9b64f6c52d241a7d3 /apps | |
| parent | 369c552e41bc6e560b3dbcd29f8b0bcf7fa28f19 (diff) | |
| parent | ea994fe8fb093a7f33967d3380a67645353475dd (diff) | |
| download | nextcloud-server-9496ce6c7a35f5a6d151b78d78a45b1c900b3b2a.tar.gz nextcloud-server-9496ce6c7a35f5a6d151b78d78a45b1c900b3b2a.zip | |
Merge pull request #46079 from nextcloud/fix/well-known-checks
fix(settings): make trailing slash for caldav/carddav redirects optional
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/SetupChecks/WellKnownUrls.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings/lib/SetupChecks/WellKnownUrls.php b/apps/settings/lib/SetupChecks/WellKnownUrls.php index d66fde3abee..2b5481d16ff 100644 --- a/apps/settings/lib/SetupChecks/WellKnownUrls.php +++ b/apps/settings/lib/SetupChecks/WellKnownUrls.php @@ -63,7 +63,7 @@ class WellKnownUrls implements ISetupCheck { if (!$works && $response->getStatusCode() === 401) { $redirectHops = explode(',', $response->getHeader('X-Guzzle-Redirect-History')); $effectiveUri = end($redirectHops); - $works = str_ends_with($effectiveUri, '/remote.php/dav/'); + $works = str_ends_with(rtrim($effectiveUri, '/'), '/remote.php/dav'); } } // Skip the other requests if one works |