summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortailor <cygnus@cprogrammer.org>2007-11-16 01:28:16 +0000
committertailor <cygnus@cprogrammer.org>2007-11-16 01:28:16 +0000
commite50f3806f24f571bef472184093b2bcb5d301e29 (patch)
tree74bfa0d89d44736eae1bf7609492bcd6dfa10693
parente978e0d8794f1a3c83a83b2e8065c29979bf444f (diff)
downloadphp-openid-e50f3806f24f571bef472184093b2bcb5d301e29.zip
php-openid-e50f3806f24f571bef472184093b2bcb5d301e29.tar.gz
php-openid-e50f3806f24f571bef472184093b2bcb5d301e29.tar.bz2
[project @ Fix OpenID 1 1.1/1.0 type URI fallback in discovery verification]
-rw-r--r--Auth/OpenID/Consumer.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 202c003..565f3d6 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -993,8 +993,11 @@ class Auth_OpenID_GenericConsumer {
$result = $this->_verifyDiscoverySingle($endpoint, $to_match);
if (is_a($result, 'Auth_OpenID_TypeURIMismatch')) {
- $this->_verifyDiscoverySingle($endpoint, $to_match_1_0);
- } else if (Auth_OpenID::isFailure($result)) {
+ $result = $this->_verifyDiscoverySingle($endpoint,
+ $to_match_1_0);
+ }
+
+ if (Auth_OpenID::isFailure($result)) {
// oidutil.log("Error attempting to use stored
// discovery information: " + str(e))
// oidutil.log("Attempting discovery to