Fix subtle error in Regex matching URI scheme.

HaroldPutman · HaroldPutman · commit 1ff77f2363eb · 2013-06-21T15:17:59.000-04:00
[+-.] will match plus, hyphen, and dot, but also comma. Use [+\-.] since  commas not allowed in URI scheme.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -888,7 +888,7 @@ public static function url($url = null, $full = false) {
 				$output .= Inflector::underscore($params['controller']) . '/' . $url;
 			}
 		}
-		$protocol = preg_match('#^[a-z][a-z0-9+-.]*\://#i', $output);
+		$protocol = preg_match('#^[a-z][a-z0-9+\-.]*\://#i', $output);
 		if ($protocol === 0) {
 			$output = str_replace('//', '/', $base . '/' . $output);
 

Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ public static function url($url = null, $full = false) {`
`888`	`888`	`$output .= Inflector::underscore($params['controller']) . '/' . $url;`
`889`	`889`	`}`
`890`	`890`	`}`
`891`		`- $protocol = preg_match('#^[a-z][a-z0-9+-.]*\://#i', $output);`
	`891`	`+ $protocol = preg_match('#^[a-z][a-z0-9+\-.]*\://#i', $output);`
`892`	`892`	`if ($protocol === 0) {`
`893`	`893`	`$output = str_replace('//', '/', $base . '/' . $output);`
`894`	`894`