mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-03 11:47:38 +02:00
Code Issues Releases Wiki Activity

Avoid sending unicode chars in headers for Wildfire/FirePHPHandler/ChromePHPHandler, fixes #1521

Browse Source
This commit is contained in:
Jordi Boggiano
2020-12-10 17:14:21 +01:00
parent 9ce0431191
commit 863670fa94
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Monolog/Formatter/WildfireFormatter.php
View File

@@ -36,6 +36,17 @@ class WildfireFormatter extends NormalizerFormatter
Logger::EMERGENCY => 'ERROR', Logger::EMERGENCY => 'ERROR',
]; ];
/**
* @param string|null $dateFormat The format of the timestamp: one supported by DateTime::format
*/
public function __construct(?string $dateFormat = null)
{
parent::__construct($dateFormat);
// http headers do not like non-ISO-8559-1 characters
$this->removeJsonEncodeOption(JSON_UNESCAPED_UNICODE);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

2
src/Monolog/Handler/ChromePHPHandler.php
View File

@@ -145,7 +145,7 @@ class ChromePHPHandler extends AbstractProcessingHandler
self::$json['request_uri'] = $_SERVER['REQUEST_URI'] ?? ''; self::$json['request_uri'] = $_SERVER['REQUEST_URI'] ?? '';
} }
$json = Utils::jsonEncode(self::$json, null, true); $json = Utils::jsonEncode(self::$json, Utils::DEFAULT_JSON_FLAGS & ~JSON_UNESCAPED_UNICODE, true);
$data = base64_encode(utf8_encode($json)); $data = base64_encode(utf8_encode($json));
if (strlen($data) > 3 * 1024) { if (strlen($data) > 3 * 1024) {
self::$overflowed = true; self::$overflowed = true;

2
src/Monolog/Utils.php
View File

@@ -63,7 +63,7 @@ final class Utils
* Return the JSON representation of a value * Return the JSON representation of a value
* *
* @param mixed $data * @param mixed $data
* @param int $encodeFlags flags to pass to json encode, defaults to JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE * @param int $encodeFlags flags to pass to json encode, defaults to DEFAULT_JSON_FLAGS
* @param bool $ignoreErrors whether to ignore encoding errors or to throw on error, when ignored and the encoding fails, "null" is returned which is valid json for null * @param bool $ignoreErrors whether to ignore encoding errors or to throw on error, when ignored and the encoding fails, "null" is returned which is valid json for null
* @throws \RuntimeException if encoding fails and errors are not ignored * @throws \RuntimeException if encoding fails and errors are not ignored
* @return string when errors are ignored and the encoding fails, "null" is returned which is valid json for null * @return string when errors are ignored and the encoding fails, "null" is returned which is valid json for null