Changed the regex to follow the RFC 3986, working to protocols like "…

…svn+ssh://" and "ed2k://"
cakephp · Nov 3, 2010 · adb2d90 · adb2d90
1 parent b752766
commit adb2d90
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -831,7 +831,7 @@ public static function url($url = null, $full = false) {
 				$output .= Inflector::underscore($params['controller']) . '/' . $url;
 			}
 		}
-		$protocol = preg_match('#^[a-z]+\://#', $output);
+		$protocol = preg_match('#^[a-z][a-z0-9+-.]*\://#i', $output);
 		if ($protocol === 0) {
 			$output = str_replace('//', '/', $base . '/' . $output);
 

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -2248,4 +2248,20 @@ function testUrlFullUrlReturnFromRoute() {
 		$this->assertEquals($url, $result);
 	}
 
+/**
+ * test protocol in url
+ *
+ * @return void
+ */
+	public function testUrlProtocol() {
+		$url = 'http://example.com';
+		$this->assertEqual($url, Router::url($url));
+
+		$url = 'ed2k://example.com';
+		$this->assertEqual($url, Router::url($url));
+
+		$url = 'svn+ssh://example.com';
+		$this->assertEqual($url, Router::url($url));
+	}
+
 }