Fix empty response bodies when redirect URL's are empty.

When redirecting XHR requests to an empty URL the response body should not be overwritten. Fixes #3835
cakephp · May 17, 2013 · e23c4ff · e23c4ff
1 parent 9147f54
commit e23c4ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -244,6 +244,9 @@ public function beforeRedirect(Controller $controller, $url, $status = null, $ex
 		if (!$this->request->is('ajax')) {
 			return;
 		}
+		if (empty($url)) {
+			return;
+		}
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 		foreach ($_POST as $key => $val) {
 			unset($_POST[$key]);

diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -411,6 +411,23 @@ public function testNonAjaxRedirect() {
 		$this->assertNull($this->RequestHandler->beforeRedirect($this->Controller, '/'));
 	}
 
+/**
+ * test that redirects with ajax and no url don't do anything.
+ *
+ * @return void
+ */
+	public function testAjaxRedirectWithNoUrl() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->Controller->response = $this->getMock('CakeResponse');
+
+		$this->Controller->response->expects($this->never())
+			->method('body');
+
+		$this->RequestHandler->initialize($this->Controller);
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertNull($this->RequestHandler->beforeRedirect($this->Controller, null));
+	}
+
 /**
  * testRenderAs method
  *