Make extensions handled in Routing\Route\Route

They should be part of normal route generation with
other parts of the url.

lib/Cake/Routing/Route/Route.php

@@ -376,6 +376,13 @@ public function match($url, $context = array()) {
 		}
 		unset($url['_host'], $url['_scheme'], $url['_port'], $url['_base']);
 
+		// Move extension into the hostOptions so its not part of
+		// reverse matches.
+		if (isset($url['_ext'])) {
+			$hostOptions['_ext'] = $url['_ext'];
+			unset($url['_ext']);
+		}
+
 		if (isset($defaults['prefix'])) {
 			$url['prefix'] = $defaults['prefix'];
 		}
@@ -503,6 +510,9 @@ protected function _writeUrl($params, $pass = array(), $query = array()) {
 				$out
 			);
 		}
+		if (!empty($params['_ext'])) {
+			$out .= '.' . $params['_ext'];
+		}
 		if (!empty($query)) {
 			$out = rtrim($out, '/');
 			$out .= '?' . http_build_query($query);

lib/Cake/Routing/Router.php

@@ -635,7 +635,7 @@ public static function url($url = null, $options = false) {
 			$here = null;
 		}
 
-		$extension = $output = $frag = null;
+		$output = $frag = null;
 
 		if (empty($url)) {
 			$output = isset($here) ? $here : '/';
@@ -659,7 +659,7 @@ public static function url($url = null, $options = false) {
 				unset($url['#']);
 			}
 			if (isset($url['ext'])) {
-				$extension = '.' . $url['ext'];
+				$url['_ext'] = $url['ext'];
 				unset($url['ext']);
 			}
 			if (isset($url['ssl'])) {
@@ -693,6 +693,9 @@ public static function url($url = null, $options = false) {
 				'plugin' => $params['plugin']
 			);
 			$output = self::$_routes->match($url, $params);
+		// } elseif (is_string($url) && $url[0] !== '/') {
+			// named route.
+
 		} else {
 			// String urls.
 			if (
@@ -728,7 +731,7 @@ public static function url($url = null, $options = false) {
 				$output = rtrim($output, '/');
 			}
 		}
-		return $output . $extension . $frag;
+		return $output . $frag;
 	}
 
 /**