Merge remote branch 'origin/3.1/develop' into 3.1/develop

classes/kohana/request.php

@@ -724,9 +724,6 @@ public function __construct($uri, Cache $cache = NULL, $injected_routes = array(
 		// Initialise the header
 		$this->_header = new HTTP_Header(array());
 
-		// Remove trailing slashes from the URI
-		$uri = trim($uri, '/');
-
 		// Assign injected routes
 		$this->_injected_routes = $injected_routes;
 
@@ -736,6 +733,9 @@ public function __construct($uri, Cache $cache = NULL, $injected_routes = array(
 		 */
 		if (strpos($uri, '://') === FALSE)
 		{
+			// Remove trailing slashes from the URI
+			$uri = trim($uri, '/');
+
 			$processed_uri = Request::process_uri($uri, $this->_injected_routes);
 
 			if ($processed_uri === NULL)

tests/kohana/RequestTest.php

@@ -494,4 +494,45 @@ public function test_post_max_size_exceeded($content_length, $expected)
 		// Test the post_max_size_exceeded() method
 		$this->assertSame(Request::post_max_size_exceeded(), $expected);
 	}
-}
+
+	/**
+	 * Provides data for test_uri_only_trimed_on_internal()
+	 *
+	 * @return  array
+	 */
+	public function provider_uri_only_trimed_on_internal()
+	{
+		return array(
+			array(
+				new Request('http://www.google.com'),
+				'http://www.google.com'
+			),
+			array(
+				new Request('http://www.google.com/'),
+				'http://www.google.com/'
+			),
+			array(
+				new Request('foo/bar/'),
+				'foo/bar'
+			),
+			array(
+				new Request('foo/bar'),
+				'foo/bar'
+			)
+		);
+	}
+
+	/**
+	 * Tests that the uri supplied to Request is only trimed
+	 * for internal requests.
+	 * 
+	 * @dataProvider provider_uri_only_trimed_on_internal
+	 *
+	 * @return void
+	 */
+	public function test_uri_only_trimed_on_internal($request, $expected)
+	{
+		$this->assertSame($request->uri(), $expected);
+	}
+
+} // End Kohana_RequestTest