bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Fix IHTTPResult::getHeader/s()

Browse source 
- Split functionality "getHeader()" and "getHeaders()" analog to IMessageInterface::getHeader/s()
- Fix functionality at various places
- Adapt CurlResultTest
This commit is contained in:
Philipp Holzer 2020-10-09 19:33:19 +02:00
commit 933ea7c9ce
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
11 changed files with 96 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Util/ParseUrl.php
View file

@ -175,7 +175,6 @@ class ParseUrl
return $siteinfo;
}
$header = $curlResult->getHeader();
$body = $curlResult->getBody();
if ($do_oembed) {
@ -204,7 +203,7 @@ class ParseUrl
$charset = '';
// Look for a charset, first in headers
// Expected form: Content-Type: text/html; charset=ISO-8859-4
if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $header, $matches)) {
if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) {
$charset = trim(trim(trim(array_pop($matches)), ';,'));
}