bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9263 from MrPetovan/bug/parse-url-charset

Browse source 
Improve charset detection in Util\ParseUrl
This commit is contained in:
Michael Vogel 2020-09-23 05:13:50 +02:00 committed by GitHub
commit 9c93240770
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Util/ParseUrl.php
View file

@ -201,9 +201,18 @@ class ParseUrl
}
}
// Fetch the first mentioned charset. Can be in body or header
$charset = '';
if (preg_match('/charset=(.*?)[\'"\s\n]/', $header, $matches)) {
// Look for a charset, first in headers
// Expected form: Content-Type: text/html; charset=ISO-8859-4
if (preg_match('/charset=(.+?)\s/', $header, $matches)) {
$charset = trim(trim(trim(array_pop($matches)), ';,'));
}
// Then in body that gets precedence
// Expected forms:
// - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
// - <meta charset="utf-8">
if (preg_match('/charset=["\']?([^\'"]*?)[\'"]/', $body, $matches)) {
$charset = trim(trim(trim(array_pop($matches)), ';,'));
}