1 files changed, 20 insertions, 24 deletions

diff --git a/src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs b/src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
index 815de68..34f55e9 100644
--- a/src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
+++ b/src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
@@ -61,7 +61,8 @@ namespace DotNetOpenAuth.Messaging {
 			Contract.Ensures(this.queryString == request.QueryString);
 
 			this.HttpMethod = request.HttpMethod;
-			this.Url = GetPublicFacingUrl(request);
+			this.Url = request.Url;
+			this.UrlBeforeRewriting = GetPublicFacingUrl(request);
 			this.RawUrl = request.RawUrl;
 			this.Headers = GetHeaderCollection(request.Headers);
 			this.InputStream = request.InputStream;
@@ -91,6 +92,7 @@ namespace DotNetOpenAuth.Messaging {
 
 			this.HttpMethod = httpMethod;
 			this.Url = requestUrl;
+			this.UrlBeforeRewriting = requestUrl;
 			this.RawUrl = rawUrl;
 			this.Headers = headers;
 			this.InputStream = inputStream;
@@ -105,6 +107,7 @@ namespace DotNetOpenAuth.Messaging {
 
 			this.HttpMethod = listenerRequest.HttpMethod;
 			this.Url = listenerRequest.Url;
+			this.UrlBeforeRewriting = listenerRequest.Url;
 			this.RawUrl = listenerRequest.RawUrl;
 			this.Headers = new WebHeaderCollection();
 			foreach (string key in listenerRequest.Headers) {
@@ -126,6 +129,7 @@ namespace DotNetOpenAuth.Messaging {
 			this.HttpMethod = request.Method;
 			this.Headers = request.Headers;
 			this.Url = requestUri;
+			this.UrlBeforeRewriting = requestUri;
 			this.RawUrl = MakeUpRawUrlFromUrl(requestUri);
 		}
 
@@ -149,6 +153,7 @@ namespace DotNetOpenAuth.Messaging {
 
 			this.HttpMethod = request.Method;
 			this.Url = request.RequestUri;
+			this.UrlBeforeRewriting = request.RequestUri;
 			this.RawUrl = MakeUpRawUrlFromUrl(request.RequestUri);
 			this.Headers = GetHeaderCollection(request.Headers);
 			this.InputStream = null;
@@ -193,29 +198,13 @@ namespace DotNetOpenAuth.Messaging {
 		internal string RawUrl { get; set; }
 
 		/// <summary>
-		/// Gets the full URL of a request before rewriting.
+		/// Gets or sets the full public URL used by the remote client to initiate this request,
+		/// before any URL rewriting and before any changes made by web farm load distributors.
 		/// </summary>
-		internal Uri UrlBeforeRewriting {
-			get {
-				Contract.Ensures(Contract.Result<Uri>() != null || this.Url == null || this.RawUrl == null);
-
-				if (this.Url == null || this.RawUrl == null) {
-					return null;
-				}
-
-				// 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(this.Url, this.RawUrl);
-			}
-		}
+		internal Uri UrlBeforeRewriting { get; set; }
 
 		/// <summary>
-		/// Gets the query part of the URL (The ? and everything after it).
+		/// Gets the query part of the URL (The ? and everything after it), after URL rewriting.
 		/// </summary>
 		internal string Query {
 			get { return this.Url != null ? this.Url.Query : null; }
@@ -238,7 +227,7 @@ namespace DotNetOpenAuth.Messaging {
 			get {
 				Contract.Ensures(Contract.Result<NameValueCollection>() != null);
 				if (this.form == null) {
-					if (this.HttpMethod == "POST" && this.Headers[HttpRequestHeader.ContentType] == "application/x-www-form-urlencoded") {
+					if (this.HttpMethod == "POST" && this.Headers[HttpRequestHeader.ContentType] == Channel.HttpFormUrlEncoded) {
 						StreamReader reader = new StreamReader(this.InputStream);
 						long originalPosition = 0;
 						if (this.InputStream.CanSeek) {
@@ -302,7 +291,7 @@ namespace DotNetOpenAuth.Messaging {
 		/// 	<c>true</c> if this request's URL was rewritten; otherwise, <c>false</c>.
 		/// </value>
 		internal bool IsUrlRewritten {
-			get { return this.Url.PathAndQuery != this.RawUrl; }
+			get { return this.Url != this.UrlBeforeRewriting; }
 		}
 
 		/// <summary>
@@ -359,7 +348,14 @@ namespace DotNetOpenAuth.Messaging {
 				return publicRequestUri.Uri;
 			} else {
 				// Failover to the method that works for non-web farm enviroments.
-				return request.Url;
+				// 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(request.Url, request.RawUrl);
 			}
 		}