geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3-fix-url-encoding' into v3-feature-uri

Browse Source
This commit is contained in:
Simon Sessingø
2017-08-23 20:44:57 +01:00
parent acf37c4023 e84c8c2f02
commit ea255baec3
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Request.php
+1 -1
View File
@@ -30,7 +30,7 @@ class Request
{
$this->parseHeaders();
$this->host = $this->getHeader('http-host');
$this->uri = $this->getHeader('request-uri');
$this->uri = urldecode($this->getHeader('request-uri'));
$this->input = new Input($this);
$this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
}
src/Pecee/SimpleRouter/Route/RouteController.php
+1 -2
View File
@@ -87,8 +87,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
public function matchRoute($url, Request $request)
{
$url = parse_url(urldecode($url), PHP_URL_PATH);
$url = rtrim($url, '/') . '/';
$url = rtrim(parse_url($url, PHP_URL_PATH), '/') . '/';
/* Match global regular-expression for route */
$regexMatch = $this->matchRegex($request, $url);
src/Pecee/SimpleRouter/Route/RouteResource.php
+1 -2
View File
@@ -79,8 +79,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
public function matchRoute($url, Request $request)
{
$url = parse_url(urldecode($url), PHP_URL_PATH);
$url = rtrim($url, '/') . '/';
$url = rtrim(parse_url($url, PHP_URL_PATH), '/') . '/';
/* Match global regular-expression for route */
$regexMatch = $this->matchRegex($request, $url);
src/Pecee/SimpleRouter/Route/RouteUrl.php
+1 -2
View File
@@ -14,8 +14,7 @@ class RouteUrl extends LoadableRoute
public function matchRoute($url, Request $request)
{
$url = parse_url(urldecode($url), PHP_URL_PATH);
$url = rtrim($url, '/') . '/';
$url = rtrim(parse_url($url, PHP_URL_PATH), '/') . '/';
/* Match global regular-expression for route */
$regexMatch = $this->matchRegex($request, $url);