From 1b14c1733ba9fcd016eb7c8ed79a25633a5d08ae Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 22 Nov 2010 16:36:42 -0800 Subject: [PATCH] relax content-type check on yadi discovery document --- library/openid.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/openid.php b/library/openid.php index 7c88c02d82..eec652bb18 100644 --- a/library/openid.php +++ b/library/openid.php @@ -348,8 +348,8 @@ class LightOpenID } 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. $content = $this->request($url, 'GET'); @@ -375,7 +375,7 @@ class LightOpenID $server = $server[1]; if (isset($delegate[2])) $this->identity = trim($delegate[2]); $this->version = 2; - +logger('Server: ' . $server); $this->server = $server; return $server; } @@ -419,7 +419,7 @@ class LightOpenID } if (!$content) $content = $this->request($url, 'GET'); - +logger('openid' . $content); # At this point, the YADIS Discovery has failed, so we'll switch # to openid2 HTML discovery, then fallback to openid 1.1 discovery. $server = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');