tidal
diff --git a/‎src/Symfony/Components/RequestHandler/Request.php
Copy file name to clipboardExpand all lines: src/Symfony/Components/RequestHandler/Request.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Components/RequestHandler/Request.php
Copy file name to clipboardExpand all lines: src/Symfony/Components/RequestHandler/Request.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -642,13 +642,13 @@ protected function prepareBaseUrl()
     // Does the baseUrl have anything in common with the request_uri?
     $requestUri = $this->getRequestUri();
 
-    if (0 === strpos($requestUri, $baseUrl))
+    if ($baseUrl && 0 === strpos($requestUri, $baseUrl))
     {
       // full $baseUrl matches
       return $baseUrl;
     }
 
-    if (0 === strpos($requestUri, dirname($baseUrl)))
+    if ($baseUrl && 0 === strpos($requestUri, dirname($baseUrl)))
     {
       // directory portion of $baseUrl matches
       return rtrim(dirname($baseUrl), '/');
Original file line number	Diff line number	Diff line change
`@@ -642,13 +642,13 @@ protected function prepareBaseUrl()`
`642`	`642`	`// Does the baseUrl have anything in common with the request_uri?`
`643`	`643`	`$requestUri = $this->getRequestUri();`
`644`	`644`
`645`		`- if (0 === strpos($requestUri, $baseUrl))`
	`645`	`+ if ($baseUrl && 0 === strpos($requestUri, $baseUrl))`
`646`	`646`	`{`
`647`	`647`	`// full $baseUrl matches`
`648`	`648`	`return $baseUrl;`
`649`	`649`	`}`
`650`	`650`
`651`		`- if (0 === strpos($requestUri, dirname($baseUrl)))`
	`651`	`+ if ($baseUrl && 0 === strpos($requestUri, dirname($baseUrl)))`
`652`	`652`	`{`
`653`	`653`	`// directory portion of $baseUrl matches`
`654`	`654`	`return rtrim(dirname($baseUrl), '/');`