diff options
author | Christian Weiske <cweiske@cweiske.de> | 2012-02-15 10:12:11 +0100 |
---|---|---|
committer | Christian Weiske <cweiske@cweiske.de> | 2014-03-26 22:49:31 +0100 |
commit | 09cf21aa7e427647526f558e458f72c3bbe71935 (patch) | |
tree | a7b3920959bd934c5213915aed8402387d30abea | |
parent | 3acd0e8db429a8de4f4b6a1b7214a8f4bdf84c1f (diff) | |
download | SemanticScuttle-09cf21aa7e427647526f558e458f72c3bbe71935.zip SemanticScuttle-09cf21aa7e427647526f558e458f72c3bbe71935.tar.gz SemanticScuttle-09cf21aa7e427647526f558e458f72c3bbe71935.tar.bz2 |
use custom HTTP adapter to get rid of HTTP warnings thrown by XML_XRD's simplexml_load_file usage
-rw-r--r-- | build.xml | 8 | ||||
-rw-r--r-- | src/SemanticScuttle/Service/OpenId.php | 8 |
2 files changed, 11 insertions, 5 deletions
@@ -105,15 +105,15 @@ channel="pear.php.net" minimum_version="0.4.0" /> + <package name="HTML_Request2" + channel="pear.php.net" + minimum_version="2.0.0" + /> <package name="Net_WebFinger" channel="pear.php.net" minimum_version="0.2.0" /> <!-- unit tests: --> - <package name="HTML_Request2" - channel="pear.php.net" - minimum_version="2.0.0" - /> <package name="Stream_Var" channel="pear.php.net" minimum_version="1.1.0" diff --git a/src/SemanticScuttle/Service/OpenId.php b/src/SemanticScuttle/Service/OpenId.php index c566dce..80d40e2 100644 --- a/src/SemanticScuttle/Service/OpenId.php +++ b/src/SemanticScuttle/Service/OpenId.php @@ -16,7 +16,6 @@ require_once 'SemanticScuttle/Model/OpenId.php'; require_once 'OpenID.php'; require_once 'OpenID/RelyingParty.php'; require_once 'OpenID/Extension/SREG11.php'; -require_once 'Net/WebFinger.php'; /** * SemanticScuttle OpenID verification and management @@ -75,7 +74,14 @@ class SemanticScuttle_Service_OpenId extends SemanticScuttle_DbService } require_once 'Net/WebFinger.php'; + require_once 'HTTP/Request2.php'; + + $req = new HTTP_Request2(); + $req->setConfig('follow_redirects', true); + $req->setHeader('User-Agent', 'SemanticScuttle'); + $wf = new Net_WebFinger(); + $wf->setHttpClient($req); $react = $wf->finger($identifier); if ($react->openid === null) { throw new SemanticScuttle_Exception_User( |