From e31781c69f0b13fe251771c8e7e529222630a44f Mon Sep 17 00:00:00 2001 From: flashwave Date: Mon, 20 Nov 2023 19:01:19 +0000 Subject: [PATCH] Always use UTF-8 for HTML if no content type is specified. --- VERSION | 2 +- src/Http/HttpFx.php | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index c16f6bf..fcc7236 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2311.91403 +0.2311.201900 diff --git a/src/Http/HttpFx.php b/src/Http/HttpFx.php index 731f0ec..23d4f2d 100644 --- a/src/Http/HttpFx.php +++ b/src/Http/HttpFx.php @@ -1,7 +1,7 @@ setContent(new StringContent($result)); if(!$responseBuilder->hasContentType()) { - $charset = strtolower(mb_preferred_mime_name(mb_detect_encoding($result))); + if(strtolower(substr($result, 0, 14)) === 'setTypeHTML('utf-8'); + else { + $charset = strtolower(mb_preferred_mime_name(mb_detect_encoding($result))); - if(strtolower(substr($result, 0, 5)) === 'setTypeXML($charset); - elseif(strtolower(substr($result, 0, 14)) === 'setTypeHTML($charset); - else - $responseBuilder->setTypePlain($charset); + if(strtolower(substr($result, 0, 5)) === 'setTypeXML($charset); + else + $responseBuilder->setTypePlain($charset); + } } } }