Merge pull request #46093 from nextcloud/backport/46079/stable29

susnux · web-flow · commit 16e6f9c8dccf · 2024-07-10T01:06:26.000+02:00
[stable29] fix(settings): make trailing slash for caldav/carddav redirects optional
diff --git a/apps/settings/lib/SetupChecks/WellKnownUrls.php b/apps/settings/lib/SetupChecks/WellKnownUrls.php
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function run(): SetupResult {`
`81`	`81`	`if (!$works && $response->getStatusCode() === 401) {`
`82`	`82`	`$redirectHops = explode(',', $response->getHeader('X-Guzzle-Redirect-History'));`
`83`	`83`	`$effectiveUri = end($redirectHops);`
`84`		`- $works = str_ends_with($effectiveUri, '/remote.php/dav/');`
	`84`	`+ $works = str_ends_with(rtrim($effectiveUri, '/'), '/remote.php/dav');`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`// Skip the other requests if one works`