php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 14:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test break.

Browse Source
This commit is contained in:
Qiang Xue
2013-06-09 10:32:29 -04:00
parent ec8de6088c
commit ef5afef7b2
2 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
framework/yii/web/Response.php
View File

@@ -118,7 +118,7 @@ class Response extends \yii\base\Response
511 => 'Network Authentication Required',
);
private $_statusCode = 200;
private $_statusCode;
/**
* @var HeaderCollection
*/
@@ -199,6 +199,14 @@ class Response extends \yii\base\Response
$this->sendContent();
}
public function reset()
{
$this->_headers = null;
$this->_statusCode = null;
$this->statusText = null;
$this->content = null;
}
/**
* Sends the response headers to the client
*/
@@ -207,7 +215,10 @@ class Response extends \yii\base\Response
if (headers_sent()) {
return;
}
header("HTTP/{$this->version} " . $this->getStatusCode() . " {$this->statusText}");
$statusCode = $this->getStatusCode();
if ($statusCode !== null) {
header("HTTP/{$this->version} $statusCode {$this->statusText}");
}
if ($this->_headers) {
$headers = $this->getHeaders();
foreach ($headers as $name => $values) {
@@ -334,10 +345,10 @@ class Response extends \yii\base\Response
ob_start();
Yii::$app->end(0, false);
ob_end_clean();
echo $content;
$this->content = $content;
exit(0);
} else {
echo $content;
$this->content = $content;
}
}