Improve request URI determination.

0db0dade · Taylor Otwell · d380992a · 0db0dade
Commit 0db0dade authored Jun 15, 2011 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

request.php system/request.php +6 -1

No files found.
--- a/system/request.php
+++ b/system/request.php
@@ -36,7 +36,12 @@ class Request {
 		// -------------------------------------------------------
 		elseif (isset($_SERVER['REQUEST_URI']))
 		{
-			$uri = str_replace('/index.php', '', $_SERVER['REQUEST_URI']);
+			$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+
+			if ($uri === false)
+			{
+				throw new \Exception("Malformed request URI. Request terminated.");
+			}
 		}
 		// -------------------------------------------------------
 		// Neither PATH_INFO or REQUEST_URI are available.