Skip to content

[stable9.1] 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#section-3.3 #25837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Aug 18, 2016
Merged

[stable9.1] 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#section-3.3 #25837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/public/AppFramework/Http/JSONResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,21 @@ public function __construct($data=array(), $statusCode=Http::STATUS_OK) {

/**
* Returns the rendered json
* @return string the rendered json
* @return string|null the rendered json
* @since 6.0.0
* @throws \Exception If data could not get encoded
*/
public function render() {
$response = json_encode($this->data, JSON_HEX_TAG);
if($response === false) {
throw new \Exception(sprintf('Could not json_encode due to invalid ' .
'non UTF-8 characters in the array: %s', var_export($this->data, true)));
if ($this->getStatus() === Http::STATUS_NO_CONTENT
|| $this->getStatus() === Http::STATUS_NOT_MODIFIED
) {
$response = null;
} else {
$response = json_encode($this->data, JSON_HEX_TAG);
if ($response === false) {
throw new \Exception(sprintf('Could not json_encode due to invalid ' .
'non UTF-8 characters in the array: %s', var_export($this->data, true)));
}
}

return $response;
Expand Down