jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

relax content-type check on yadi discovery document

Browse source
This commit is contained in:
Friendika 2010-11-22 16:36:42 -08:00
parent fb58801aa4
commit 1b14c1733b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/openid.php
View file

@ -348,8 +348,8 @@ class LightOpenID
} }
if (isset($headers['content-type']) if (isset($headers['content-type'])
&& strpos($headers['content-type'], 'application/xrds+xml') !== false && ((strpos($headers['content-type'], 'application/xrds+xml') !== false
) { ) || (strpos($headers['content-type'], 'text/xml') !== false))) {
# Found an XRDS document, now let's find the server, and optionally delegate. # Found an XRDS document, now let's find the server, and optionally delegate.
$content = $this->request($url, 'GET'); $content = $this->request($url, 'GET');
@ -375,7 +375,7 @@ class LightOpenID
$server = $server[1]; $server = $server[1];
if (isset($delegate[2])) $this->identity = trim($delegate[2]); if (isset($delegate[2])) $this->identity = trim($delegate[2]);
$this->version = 2; $this->version = 2;
logger('Server: ' . $server);
$this->server = $server; $this->server = $server;
return $server; return $server;
} }
@ -419,7 +419,7 @@ class LightOpenID
} }
if (!$content) $content = $this->request($url, 'GET'); if (!$content) $content = $this->request($url, 'GET');
logger('openid' . $content);
# At this point, the YADIS Discovery has failed, so we'll switch # At this point, the YADIS Discovery has failed, so we'll switch
# to openid2 HTML discovery, then fallback to openid 1.1 discovery. # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
$server = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href'); $server = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');