From 8c336638b3ba8f99fe7658ec8df74266559acadb Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 7 Apr 2011 15:53:35 -0700
Subject: [PATCH] Changing the HttpRequestExtensions to use request.Url.Host
 instead of request.Headers["Host"]

...since that's what WebPages' IsUrlLocalToHost uses for
local URL checking. This became an issue in the spec tests where the header
didn't match the Url property.

--HG--
branch : 1.x
---
 .../Utility/Extensions/HttpRequestExtensions.cs      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
index 7a6e91d07..9c1b5bb23 100644
--- a/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
+++ b/src/Orchard/Utility/Extensions/HttpRequestExtensions.cs
@@ -8,7 +8,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToRootUrlString(this HttpRequestBase request) {
-            return string.Format("{0}://{1}", request.Url.Scheme, request.Headers["Host"]);
+            return string.Format("{0}://{1}", request.Url.Scheme, request.Url.Host);
         }
 
         /// <summary>
@@ -17,7 +17,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToRootUrlString(this HttpRequest request) {
-            return string.Format("{0}://{1}", request.Url.Scheme, request.Headers["Host"]);
+            return string.Format("{0}://{1}", request.Url.Scheme, request.Url.Host);
         }
 
         /// <summary>
@@ -26,7 +26,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030/OrchardLocal</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToApplicationRootUrlString(this HttpRequestBase request) {
-            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.ApplicationPath);
+            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Url.Host, request.ApplicationPath);
             return url;
         }
 
@@ -36,7 +36,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030/OrchardLocal</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToApplicationRootUrlString(this HttpRequest request) {
-            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.ApplicationPath);
+            string url = string.Format("{0}://{1}{2}", request.Url.Scheme, request.Url.Host, request.ApplicationPath);
             return url;
         }
 
@@ -46,7 +46,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030/OrchardLocal/Admin/Blogs</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToUrlString(this HttpRequestBase request) {
-            return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl);
+            return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Url.Host, request.RawUrl);
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ namespace Orchard.Utility.Extensions {
         /// <example>http://localhost:3030/OrchardLocal/Admin/Blogs</example>
         /// <remarks>Prevents port number issues by using the client requested host</remarks>
         public static string ToUrlString(this HttpRequest request) {
-            return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Headers["Host"], request.RawUrl);
+            return string.Format("{0}://{1}{2}", request.Url.Scheme, request.Url.Host, request.RawUrl);
         }
     }
 }
\ No newline at end of file