Removing routing url from query string in CakeRequest. This happens m…

…ostly with nginx setups
cakephp · Aug 27, 2011 · f94394f · f94394f
1 parent 7d0250f
commit f94394f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
@@ -180,6 +180,7 @@ protected function _processGet() {
 			$query = $_GET;
 		}
 
+		unset($query['/' . $this->url]);
 		if (strpos($this->url, '?') !== false) {
 			list(, $querystr) = explode('?', $this->url);
 			parse_str($querystr, $queryArgs);

diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -1325,6 +1325,34 @@ public static function environmentGenerator() {
 					'webroot' => '/',
 				),
 			),
+			array(
+				'Nginx - w/rewrite, document root set to webroot, request root, no PATH_INFO',
+				array(
+					'App' => array(
+						'base' => false,
+						'baseUrl' => false,
+						'dir' => 'app',
+						'webroot' => 'webroot'
+					),
+					'GET' => array('/posts/add' => ''),
+					'SERVER' => array(
+						'SERVER_NAME' => 'localhost', 
+						'DOCUMENT_ROOT' => '/Library/WebServer/Documents/site/app/webroot', 
+						'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/app/webroot/index.php', 
+						'SCRIPT_NAME' => '/index.php',
+						'QUERY_STRING' => '/posts/add&',
+						'PHP_SELF' => '/index.php',
+						'PATH_INFO' => null,
+						'REQUEST_URI' => '/posts/add',
+					),
+				),
+				array(
+					'url' => 'posts/add',
+					'base' => '',
+					'webroot' => '/',
+					'urlParams' => array()
+				),
+			),
 		);
 	}
 
@@ -1343,7 +1371,7 @@ public function testEnvironmentDetection($name, $env, $expected) {
 		$this->assertEquals($expected['base'], $request->base, "base error");
 		$this->assertEquals($expected['webroot'], $request->webroot, "webroot error");
 		if (isset($expected['urlParams'])) {
-			$this->assertEqual($_GET, $expected['urlParams'], "GET param mismatch");
+			$this->assertEqual($request->query, $expected['urlParams'], "GET param mismatch");
 		}
 	}