Merge branch 'v4.0' into v4.1

DotNetOpenAuth · Nov 25, 2013 · 9ecfbac · 9ecfbac
2 parents 4dac848 + 3b01b41
commit 9ecfbac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs b/src/DotNetOpenAuth.OpenId/OpenId/Messages/IndirectSignedResponse.cs
@@ -404,8 +404,8 @@ internal IndirectSignedResponse(Version version, Uri relyingPartyReturnTo)
 				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
@@ -54,7 +54,7 @@ public XrdsDocument(XmlReader reader)
 		/// <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.