Skip to content

Commit

Permalink
Merge pull request #46093 from nextcloud/backport/46079/stable29
Browse files Browse the repository at this point in the history
[stable29] fix(settings): make trailing slash for caldav/carddav redirects optional
  • Loading branch information
susnux authored Jul 9, 2024
2 parents 66b0f6d + 79bcb9d commit 16e6f9c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/settings/lib/SetupChecks/WellKnownUrls.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function run(): SetupResult {
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
Expand Down

0 comments on commit 16e6f9c

Please sign in to comment.