From 75852626b88fefd65da3fe1ea2997815308fb687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Tuh=C3=A1=C4=8Dek?= Date: Fri, 6 May 2016 14:31:03 +0200 Subject: [PATCH 1/3] remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91) --- src/Http/RequestFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php index 993fa191..9249796a 100644 --- a/src/Http/RequestFactory.php +++ b/src/Http/RequestFactory.php @@ -81,7 +81,7 @@ public function createHttpRequest() } // path & query - $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; + $requestUrl = isset($_SERVER['REQUEST_URI']) ? Strings::replace($_SERVER['REQUEST_URI'], '#^\w+://[^/]+#i') : '/'; $requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']); $tmp = explode('?', $requestUrl, 2); $path = Url::unescape($tmp[0], '%/?#'); From f980a19c525a78567185ca9975006d5cd34c8e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Tuh=C3=A1=C4=8Dek?= Date: Fri, 6 May 2016 15:38:55 +0200 Subject: [PATCH 2/3] remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91) --- src/Http/RequestFactory.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php index 9249796a..7d504ee1 100644 --- a/src/Http/RequestFactory.php +++ b/src/Http/RequestFactory.php @@ -81,7 +81,8 @@ public function createHttpRequest() } // path & query - $requestUrl = isset($_SERVER['REQUEST_URI']) ? Strings::replace($_SERVER['REQUEST_URI'], '#^\w+://[^/]+#i') : '/'; + $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; + $requestUrl = preg_replace('#^\w++://[^/]++#', '', $_SERVER['REQUEST_URI']); $requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']); $tmp = explode('?', $requestUrl, 2); $path = Url::unescape($tmp[0], '%/?#'); From 1ff0068681394561002a7c48b1970b20cfeac303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Tuh=C3=A1=C4=8Dek?= Date: Fri, 6 May 2016 15:40:19 +0200 Subject: [PATCH 3/3] remove absolute URI from $_SERVER['REQUEST_URI'] (issue #91) --- src/Http/RequestFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php index 7d504ee1..e1c381e8 100644 --- a/src/Http/RequestFactory.php +++ b/src/Http/RequestFactory.php @@ -82,7 +82,7 @@ public function createHttpRequest() // path & query $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; - $requestUrl = preg_replace('#^\w++://[^/]++#', '', $_SERVER['REQUEST_URI']); + $requestUrl = preg_replace('#^\w++://[^/]++#', '', $requestUrl); $requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']); $tmp = explode('?', $requestUrl, 2); $path = Url::unescape($tmp[0], '%/?#');