fix original/too loose matching

mvorisek · mvorisek · commit 10a3fb32bc7f · 2020-10-17T21:44:16.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1944,11 +1944,11 @@ protected function prepareBaseUrl()
             $truncatedRequestUri = substr($requestUri, 0, $pos);
         }
 
-        if (empty(basename($baseUrl)) || !strpos(rawurldecode($truncatedRequestUri), basename($baseUrl))) {
+        if (empty(basename($baseUrl)) || !strpos(rawurldecode($truncatedRequestUri).'/', '/'.basename($baseUrl).'/')) {
             // strip autoindex filename, for virtualhost based on URL path
             $baseUrl = \dirname($baseUrl).'/';
 
-            if (empty(basename($baseUrl)) || !strpos(rawurldecode($truncatedRequestUri), basename($baseUrl))) {
+            if (empty(basename($baseUrl)) || !strpos(rawurldecode($truncatedRequestUri).'/', '/'.basename($baseUrl).'/')) {
                 // no match whatsoever; set it blank
                 return '';
             }

Original file line number	Diff line number	Diff line change
`@@ -1944,11 +1944,11 @@ protected function prepareBaseUrl()`
`1944`	`1944`	`$truncatedRequestUri = substr($requestUri, 0, $pos);`
`1945`	`1945`	`}`
`1946`	`1946`
`1947`		`- if (empty(basename($baseUrl)) \|\| !strpos(rawurldecode($truncatedRequestUri), basename($baseUrl))) {`
	`1947`	`+ if (empty(basename($baseUrl)) \|\| !strpos(rawurldecode($truncatedRequestUri).'/', '/'.basename($baseUrl).'/')) {`
`1948`	`1948`	`// strip autoindex filename, for virtualhost based on URL path`
`1949`	`1949`	`$baseUrl = \dirname($baseUrl).'/';`
`1950`	`1950`
`1951`		`- if (empty(basename($baseUrl)) \|\| !strpos(rawurldecode($truncatedRequestUri), basename($baseUrl))) {`
	`1951`	`+ if (empty(basename($baseUrl)) \|\| !strpos(rawurldecode($truncatedRequestUri).'/', '/'.basename($baseUrl).'/')) {`
`1952`	`1952`	`// no match whatsoever; set it blank`
`1953`	`1953`	`return '';`
`1954`	`1954`	`}`