diff --git a/src/Orchard.Azure/AzureFileSystem.cs b/src/Orchard.Azure/AzureFileSystem.cs index 05a42e61e..519a7477c 100644 --- a/src/Orchard.Azure/AzureFileSystem.cs +++ b/src/Orchard.Azure/AzureFileSystem.cs @@ -29,7 +29,7 @@ namespace Orchard.Azure { _storageAccount = storageAccount; ContainerName = containerName; _root = String.IsNullOrEmpty(root) ? "": root + "/"; - _absoluteRoot = _storageAccount.BlobEndpoint.AbsoluteUri + "/" + containerName + "/" + root; + _absoluteRoot = Combine(Combine(_storageAccount.BlobEndpoint.AbsoluteUri, containerName), root); using ( new HttpContextWeaver() ) { diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx b/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx deleted file mode 100644 index fcae21248..000000000 --- a/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx +++ /dev/null @@ -1,3 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Orchard.Azure.Web._Default" %> - -<%-- Please do not delete this file. It is used to ensure that ASP.NET MVC is activated by IIS when a user makes a "/" request to the server. --%> diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx.cs b/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx.cs deleted file mode 100644 index 924ecd969..000000000 --- a/src/Orchard.Azure/Orchard.Azure.Web/Default.aspx.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Web; -using System.Web.Mvc; -using System.Web.UI; - -namespace Orchard.Azure.Web { - public class _Default : Page { - public void Page_Load(object sender, EventArgs e) { - // Change the current path so that the Routing handler can correctly interpret - // the request, then restore the original path so that the OutputCache module - // can correctly process the response (if caching is enabled). - - var originalPath = Request.Path; - HttpContext.Current.RewritePath(Request.ApplicationPath, false); - IHttpHandler httpHandler = new MvcHttpHandler(); - httpHandler.ProcessRequest(HttpContext.Current); - HttpContext.Current.RewritePath(originalPath, false); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index dd2703ca9..31d043fba 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -140,10 +140,6 @@ - - Default.aspx - ASPXCodeBehind - Global.asax @@ -151,7 +147,6 @@ - diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config index 92583c3f9..7c86d8a39 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config @@ -53,7 +53,7 @@ affects performance, set this value to true only during development. --> - + @@ -116,7 +116,6 @@ - @@ -133,7 +132,6 @@ - @@ -142,7 +140,8 @@ - + +