Route: percent-encoded bytes are decoded before URL is matched (BC break)

dg · dg · commit df3207e62d4c · 2014-12-20T23:02:21.000+01:00
diff --git a/src/Application/Routers/Route.php b/src/Application/Routers/Route.php
@@ -56,7 +56,6 @@ class Route extends Nette\Object implements Application\IRouter
 	public static $styles = array(
 		'#' => array( // default style for path parameters
 			self::PATTERN => '[^/]+',
-			self::FILTER_IN => 'rawurldecode',
 			self::FILTER_OUT => array(__CLASS__, 'param2path'),
 		),
 		'?#' => array( // default style for query parameters
@@ -171,7 +170,7 @@ public function match(Nette\Http\IRequest $httpRequest)
 		}
 
 		if ($path !== '') {
-			$path = rtrim($path, '/') . '/';
+			$path = rtrim(rawurldecode($path), '/') . '/';
 		}
 
 		if (!$matches = Strings::match($path, $re)) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ class Route extends Nette\Object implements Application\IRouter`
`56`	`56`	`public static $styles = array(`
`57`	`57`	`'#' => array( // default style for path parameters`
`58`	`58`	`self::PATTERN => '[^/]+',`
`59`		`- self::FILTER_IN => 'rawurldecode',`
`60`	`59`	`self::FILTER_OUT => array(__CLASS__, 'param2path'),`
`61`	`60`	`),`
`62`	`61`	`'?#' => array( // default style for query parameters`
`@@ -171,7 +170,7 @@ public function match(Nette\Http\IRequest $httpRequest)`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`if ($path !== '') {`
`174`		`- $path = rtrim($path, '/') . '/';`
	`173`	`+ $path = rtrim(rawurldecode($path), '/') . '/';`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`if (!$matches = Strings::match($path, $re)) {`