From 2988978692499d0aec2236943de2ecf82b345fe7 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sat, 27 Dec 2014 00:02:09 +0100 Subject: [PATCH] RequestFactory: removed support for ORIG_PATH_INFO used by old IIS (BC break) see #31 --- src/Http/RequestFactory.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php index 8a282814..7006caf8 100644 --- a/src/Http/RequestFactory.php +++ b/src/Http/RequestFactory.php @@ -81,18 +81,7 @@ public function createHttpRequest() } // path & query - if (isset($_SERVER['REQUEST_URI'])) { // Apache, IIS 6.0 - $requestUrl = $_SERVER['REQUEST_URI']; - - } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0 (PHP as CGI ?) - $requestUrl = $_SERVER['ORIG_PATH_INFO']; - if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') { - $requestUrl .= '?' . $_SERVER['QUERY_STRING']; - } - } else { - $requestUrl = ''; - } - + $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; $requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']); $tmp = explode('?', $requestUrl, 2); $path = Strings::fixEncoding(Strings::replace($tmp[0], $this->urlFilters['path']));