as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-16 15:10:38 +08:00
parent fece44a852
commit 30f098040c
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Http/Response.php
+14 -15
View File
@@ -215,18 +215,13 @@ class Response extends HttpService
/** /**
* @param $sendData * @param $sendData
* @param $status * @param $status
* @return mixed * @return string
*/ */
private function sendData($sendData, $status): mixed private function sendData($sendData, $status): string
{ {
$this->response->status($status); $sendData = $this->setHeaders($status, $sendData);
$this->response->header('Content-Type', $this->getContentType());
$this->response->header('Run-Time', $this->getRuntime()); $this->response->end($sendData);
if (!empty($sendData)) {
$this->response->end($this->headers($sendData));
} else {
$this->response->end();
}
$this->response = null; $this->response = null;
unset($this->response); unset($this->response);
return $sendData; return $sendData;
@@ -234,18 +229,22 @@ class Response extends HttpService
/** /**
* @param $status
* @param $sendData * @param $sendData
* @return string * @return string
*/ */
private function headers($sendData): string private function setHeaders($status, $sendData): string
{ {
if (!empty($this->headers) && is_array($this->headers)) { $this->response->status($status);
var_dump($this->headers); $this->response->header('Content-Type', $this->getContentType());
$this->response->header('Run-Time', $this->getRuntime());
if (empty($this->headers) || !is_array($this->headers)) {
return $sendData == null ? '' : $sendData;
}
foreach ($this->headers as $key => $header) { foreach ($this->headers as $key => $header) {
$this->response->header($key, $header, true); $this->response->header($key, $header, true);
} }
$this->headers = [];
}
return $sendData == null ? '' : $sendData; return $sendData == null ? '' : $sendData;
} }