Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-11 06:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix edge cases for request types

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-09-15 17:11:33 +02:00
parent 362631a6ec
commit 2a01540348
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Message/Http/Request.php
View File

@ -141,15 +141,25 @@ final class Request extends RequestAbstract
if (isset($_SERVER['CONTENT_TYPE'])) { if (isset($_SERVER['CONTENT_TYPE'])) {
if (\stripos($_SERVER['CONTENT_TYPE'], 'application/json') !== false) { if (\stripos($_SERVER['CONTENT_TYPE'], 'application/json') !== false) {
$input = \file_get_contents('php://input'); $input = \file_get_contents('php://input');
$json = \json_decode($input === false ? '' : $input, true);
if ($input === false || $json === false || $json === null) { if ($input === false || empty($input)) {
return;
}
$json = \json_decode($input === false || empty($input) ? '' : $input, true);
if ($json === false || $json === null) {
throw new \Exception('Is not valid json ' . $input); throw new \Exception('Is not valid json ' . $input);
} }
$this->data += $json; $this->data += $json;
} elseif (\stripos($_SERVER['CONTENT_TYPE'], 'application/x-www-form-urlencoded') !== false) { } elseif (\stripos($_SERVER['CONTENT_TYPE'], 'application/x-www-form-urlencoded') !== false) {
$content = \file_get_contents('php://input'); $content = \file_get_contents('php://input');
\parse_str($content === false ? '' : $content, $temp);
if ($content === false || empty($content)) {
return;
}
\parse_str($content, $temp);
$this->data += $temp; $this->data += $temp;
} }
} }