GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Mimetype was not recognized if longer than bare mime

Browse Source
This commit is contained in:
Mikael Nordfeldth 2017-08-05 09:46:14 +02:00
parent 6938d26524
commit 945920f24d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util.php
View File

@ -2060,7 +2060,7 @@ function common_bare_mime($mimetype)
if ($semicolon = mb_strpos($mimetype, ';')) { if ($semicolon = mb_strpos($mimetype, ';')) {
$mimetype = mb_substr($mimetype, 0, $semicolon); $mimetype = mb_substr($mimetype, 0, $semicolon);
} }
return $mimetype; return trim($mimetype);
} }
function common_mime_type_match($type, $avail) function common_mime_type_match($type, $avail)

4
plugins/LRDD/lib/discovery.php
View File

@ -124,7 +124,7 @@ class Discovery
throw new Exception('Unexpected HTTP status code.'); throw new Exception('Unexpected HTTP status code.');
} }
switch ($response->getHeader('content-type')) { switch (common_bare_mime($response->getHeader('content-type'))) {
case self::JRD_MIMETYPE_OLD: case self::JRD_MIMETYPE_OLD:
case self::JRD_MIMETYPE: case self::JRD_MIMETYPE:
$type = 'json'; $type = 'json';
@ -134,7 +134,7 @@ class Discovery
break; break;
default: default:
// fall back to letting XML_XRD auto-detect // fall back to letting XML_XRD auto-detect
common_debug('No recognized content-type header for resource descriptor body.'); common_debug('No recognized content-type header for resource descriptor body on '._ve($xrd_uri));
$type = null; $type = null;
} }
$xrd->loadString($response->getBody(), $type); $xrd->loadString($response->getBody(), $type);