diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-11-25 10:20:56 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-11-25 10:20:56 -0800 |
| commit | 35776ebeb52e6cd968bd5623ff90cde005b8322f (patch) | |
| tree | e9238813cc201906cd6fb3063896ea53bdfbb8d2 | |
| parent | ccba7d1609f2f2a5dcb0e4952f406f22c9dc6bc7 (diff) | |
| parent | 9ecfbac06ab80ff22c7555ca822a8858e606641a (diff) | |
| download | DotNetOpenAuth-origin/v4.2.zip DotNetOpenAuth-origin/v4.2.tar.gz DotNetOpenAuth-origin/v4.2.tar.bz2 | |
Merge branch 'v4.1' into v4.2origin/v4.2
| -rw-r--r-- | src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs | 4 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId/Xrds/XrdsDocument.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs b/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs index 8bceb68..1242b20 100644 --- a/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs +++ b/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs @@ -404,8 +404,8 @@ namespace DotNetOpenAuth.OpenId.Messages { IsQuerySubsetOf(this.Recipient.Query, this.ReturnTo.Query), OpenIdStrings.ReturnToParamDoesNotMatchRequestUrl, Protocol.openid.return_to, - this.ReturnTo, - this.Recipient); + this.ReturnTo.AbsoluteUri, + this.Recipient.AbsoluteUri); } } } diff --git a/src/DotNetOpenAuth.OpenId/Xrds/XrdsDocument.cs b/src/DotNetOpenAuth.OpenId/Xrds/XrdsDocument.cs index 0e1ecc1..a0c59c4 100644 --- a/src/DotNetOpenAuth.OpenId/Xrds/XrdsDocument.cs +++ b/src/DotNetOpenAuth.OpenId/Xrds/XrdsDocument.cs @@ -54,7 +54,7 @@ namespace DotNetOpenAuth.Xrds { /// <param name="xml">The text that is the XRDS document.</param> [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Fixing would decrease readability, and not likely avoid any finalizer on a StringReader anyway.")] public XrdsDocument(string xml) - : this(new XPathDocument(new StringReader(xml)).CreateNavigator()) { } + : this(new XPathDocument(XmlReader.Create(new StringReader(xml), MessagingUtilities.CreateUntrustedXmlReaderSettings())).CreateNavigator()) { } /// <summary> /// Gets the XRD child elements of the document. |