2 files changed, 6 insertions, 8 deletions
diff --git a/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
index c29ec8c..81b33b0 100644
--- a/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
@@ -106,14 +106,7 @@ namespace DotNetOpenAuth.Messaging {
 			Contract.Requires<InvalidOperationException>(HttpContext.Current != null && HttpContext.Current.Request != null, MessagingStrings.HttpContextRequired);
 			HttpContext context = HttpContext.Current;
 
-			// We use Request.Url for the full path to the server, and modify it
-			// with Request.RawUrl to capture both the cookieless session "directory" if it exists
-			// and the original path in case URL rewriting is going on.  We don't want to be
-			// fooled by URL rewriting because we're comparing the actual URL with what's in
-			// the return_to parameter in some cases.
-			// Response.ApplyAppPathModifier(builder.Path) would have worked for the cookieless
-			// session, but not the URL rewriting problem.
-			return new Uri(context.Request.Url, context.Request.RawUrl);
+			return HttpRequestInfo.GetPublicFacingUrl(context.Request, context.Request.ServerVariables);
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth/OpenId/Realm.cs b/src/DotNetOpenAuth/OpenId/Realm.cs
index 818718a..4137c72 100644
--- a/src/DotNetOpenAuth/OpenId/Realm.cs
+++ b/src/DotNetOpenAuth/OpenId/Realm.cs
@@ -112,6 +112,8 @@ namespace DotNetOpenAuth.OpenId {
 		public static Realm AutoDetect {
 			get {
 				Contract.Requires<InvalidOperationException>(HttpContext.Current != null && HttpContext.Current.Request != null, MessagingStrings.HttpContextRequired);
+				Contract.Ensures(Contract.Result<Realm>() != null);
+
 				HttpRequestInfo requestInfo = new HttpRequestInfo(HttpContext.Current.Request);
 				UriBuilder realmUrl = new UriBuilder(requestInfo.UrlBeforeRewriting);
 				realmUrl.Path = HttpContext.Current.Request.ApplicationPath;
@@ -252,6 +254,7 @@ namespace DotNetOpenAuth.OpenId {
 		[SuppressMessage("Microsoft.Usage", "CA2234:PassSystemUriObjectsInsteadOfStrings", Justification = "Not all Realms are valid URLs.")]
 		[DebuggerStepThrough]
 		public static implicit operator Realm(string uri) {
+			Contract.Ensures((Contract.Result<Realm>() != null) == (uri != null));
 			return uri != null ? new Realm(uri) : null;
 		}
 
@@ -262,6 +265,7 @@ namespace DotNetOpenAuth.OpenId {
 		/// <returns>The result of the conversion.</returns>
 		[DebuggerStepThrough]
 		public static implicit operator Realm(Uri uri) {
+			Contract.Ensures((Contract.Result<Realm>() != null) == (uri != null));
 			return uri != null ? new Realm(uri) : null;
 		}
 
@@ -272,6 +276,7 @@ namespace DotNetOpenAuth.OpenId {
 		/// <returns>The result of the conversion.</returns>
 		[DebuggerStepThrough]
 		public static implicit operator string(Realm realm) {
+			Contract.Ensures((Contract.Result<string>() != null) == (realm != null));
 			return realm != null ? realm.ToString() : null;
 		}