summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Auth/OpenID/Discover.php2
-rw-r--r--Tests/Auth/OpenID/Consumer.php2
-rw-r--r--Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml2
-rw-r--r--Tests/Auth/OpenID/data/test_discover_yadis_idp.xml2
-rw-r--r--Tests/Auth/OpenID/data/test_discover_yadis_idp_delegate.xml2
-rw-r--r--Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml2
-rw-r--r--examples/server/lib/render/idpXrds.php2
7 files changed, 7 insertions, 7 deletions
diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php
index caf805f..7f03ea5 100644
--- a/Auth/OpenID/Discover.php
+++ b/Auth/OpenID/Discover.php
@@ -17,7 +17,7 @@ define('Auth_OpenID_XMLNS_1_0', 'http://openid.net/xmlns/1.0');
define('Auth_OpenID_TYPE_1_2', 'http://openid.net/signon/1.2');
define('Auth_OpenID_TYPE_1_1', 'http://openid.net/signon/1.1');
define('Auth_OpenID_TYPE_1_0', 'http://openid.net/signon/1.0');
-define('Auth_OpenID_TYPE_2_0_IDP', 'http://openid.net/server/2.0');
+define('Auth_OpenID_TYPE_2_0_IDP', 'http://specs.openid.net/auth/2.0/server');
define('Auth_OpenID_TYPE_2_0', 'http://openid.net/signon/2.0');
function Auth_OpenID_getOpenIDTypeURIs()
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 49913c4..b6a64f4 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -1770,7 +1770,7 @@ class IDPDrivenTest extends PHPUnit_TestCase {
$this->consumer = new Auth_OpenID_GenericConsumer($this->store);
$this->endpoint = new Auth_OpenID_ServiceEndpoint();
$this->endpoint->server_url = "http://idp.unittest/";
- $this->endpoint->type_uris = array('http://openid.net/server/2.0');
+ $this->endpoint->type_uris = array('http://specs.openid.net/auth/2.0/server');
}
function test_idpDrivenBegin()
diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml b/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml
index f1714cc..daef25b 100644
--- a/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml
+++ b/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml
@@ -13,7 +13,7 @@
</Service>
<Service priority="20">
- <Type>http://openid.net/server/2.0</Type>
+ <Type>http://specs.openid.net/auth/2.0/server</Type>
<URI>http://www.livejournal.com/openid/server.bml</URI>
</Service>
diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_idp.xml b/Tests/Auth/OpenID/data/test_discover_yadis_idp.xml
index 3d7ed98..f570d04 100644
--- a/Tests/Auth/OpenID/data/test_discover_yadis_idp.xml
+++ b/Tests/Auth/OpenID/data/test_discover_yadis_idp.xml
@@ -5,7 +5,7 @@
>
<XRD>
<Service priority="10">
- <Type>http://openid.net/server/2.0</Type>
+ <Type>http://specs.openid.net/auth/2.0/server</Type>
<URI>http://www.myopenid.com/server</URI>
</Service>
</XRD>
diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_idp_delegate.xml b/Tests/Auth/OpenID/data/test_discover_yadis_idp_delegate.xml
index f94c0df..5410600 100644
--- a/Tests/Auth/OpenID/data/test_discover_yadis_idp_delegate.xml
+++ b/Tests/Auth/OpenID/data/test_discover_yadis_idp_delegate.xml
@@ -5,7 +5,7 @@
>
<XRD>
<Service>
- <Type>http://openid.net/server/2.0</Type>
+ <Type>http://specs.openid.net/auth/2.0/server</Type>
<URI>http://www.myopenid.com/server</URI>
<openid:Delegate>http://smoker.myopenid.com/</openid:Delegate>
</Service>
diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml b/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml
index 20d3a19..aa89589 100644
--- a/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml
+++ b/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml
@@ -10,7 +10,7 @@
</Service>
<Service priority="20">
- <Type>http://openid.net/server/2.0</Type>
+ <Type>http://specs.openid.net/auth/2.0/server</Type>
<URI>http://www.myopenid.com/server_id</URI>
</Service>
</XRD>
diff --git a/examples/server/lib/render/idpXrds.php b/examples/server/lib/render/idpXrds.php
index 12ddd18..99c363c 100644
--- a/examples/server/lib/render/idpXrds.php
+++ b/examples/server/lib/render/idpXrds.php
@@ -9,7 +9,7 @@ define('xrds_pat', '<?xml version="1.0" encoding="UTF-8"?>
xmlns="xri://$xrd*($v*2.0)">
<XRD>
<Service priority="0">
- <Type>http://openid.net/server/2.0</Type>
+ <Type>http://specs.openid.net/auth/2.0/server</Type>
<URI>%s</URI>
</Service>
</XRD>