Merge pull request #2810 from willnode/patch-1

lonnieezell · web-flow · commit 7179fcc6c004 · 2020-04-07T13:25:51.000-05:00
Ensure $_SERVER['SCRIPT_NAME'] ends with PHP
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -721,7 +721,7 @@ protected function parseRequestURI(): string
 		$query = $parts['query'] ?? '';
 		$uri   = $parts['path'] ?? '';
 
-		if (isset($_SERVER['SCRIPT_NAME'][0]))
+		if (isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php')
 		{
 			// strip the script name from the beginning of the URI
 			if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ protected function parseRequestURI(): string`
`721`	`721`	`$query = $parts['query'] ?? '';`
`722`	`722`	`$uri = $parts['path'] ?? '';`
`723`	`723`
`724`		`- if (isset($_SERVER['SCRIPT_NAME'][0]))`
	`724`	`+ if (isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php')`
`725`	`725`	`{`
`726`	`726`	`// strip the script name from the beginning of the URI`
`727`	`727`	`if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)`