Fixed HTTP status codes for non-redirects which were breaking AuthComponent.

This commit is contained in:
Frank de Graaf 2012-05-04 16:58:51 +02:00 committed by Jose Lorenzo Rodriguez
parent 7695da637c
commit 2be9ac8888
2 changed files with 11 additions and 11 deletions

View file

@ -770,18 +770,17 @@ class Controller extends Object implements CakeEventListener {
session_write_close();
}
if (!empty($status) && is_string($status)) {
if ($url !== null) {
$this->response->header('Location', Router::url($url, true));
}
if (!empty($status)) {
if (is_string($status)) {
$codes = array_flip($this->response->httpCodes());
if (isset($codes[$status])) {
$status = $codes[$status];
}
}
if ($url !== null) {
$this->response->header('Location', Router::url($url, true));
}
if (!empty($status) && ($status >= 300 && $status < 400)) {
$this->response->statusCode($status);
}

View file

@ -728,7 +728,8 @@ class ControllerTest extends CakeTestCase {
array(303, "See Other"),
array(304, "Not Modified"),
array(305, "Use Proxy"),
array(307, "Temporary Redirect")
array(307, "Temporary Redirect"),
array(403, "Forbidden"),
);
}