harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set the correct webfinger Accept: request header now that Mastodon fixed the bug that we changed it to work around

Browse Source
This commit is contained in:
zotlabs 2018-04-16 23:32:40 -07:00
parent 43e55eb9a6
commit 8b9952e770
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/network.php
View File

@ -1240,16 +1240,9 @@ function webfinger_rfc7033($webbie, $zot = false) {
} }
logger('fetching url from resource: ' . $rhs . ':' . $webbie); logger('fetching url from resource: ' . $rhs . ':' . $webbie);
// The default curl Accept: header is */*, which is incorrectly handled by Mastodon servers
// and results in a 406 (Not Acceptable) response, and will also incorrectly produce an XML
// document if you use 'application/jrd+json, */*'. We could set this to application/jrd+json,
// but some test webfinger servers may not explicitly set the content type and they would be
// blocked. The best compromise until Mastodon is fixed is to remove the Accept header which is
// accomplished by setting it to nothing.
$counter = 0; $counter = 0;
$s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''),
false, $counter, [ 'headers' => [ 'Accept:' ] ]); false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, */*' ] ]);
if($s['success']) { if($s['success']) {
$j = json_decode($s['body'], true); $j = json_decode($s['body'], true);