lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix occasional YSOD under IIS7 when config changes

Browse Source 
Don't access HttpContext.Current, use our accessor abstraction instead.

Work Items: 16823

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-11-21 16:55:33 -08:00
parent c0ffb7b0c2
commit 45e9c2862a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard/Environment/DefaultHostEnvironment.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Web; using System.Web;
using System.Web.Hosting; using System.Web.Hosting;
using Orchard.Mvc;
using Orchard.Services; using Orchard.Services;
using Orchard.Utility.Extensions; using Orchard.Utility.Extensions;
@@ -12,10 +13,11 @@ namespace Orchard.Environment
public class DefaultHostEnvironment : IHostEnvironment public class DefaultHostEnvironment : IHostEnvironment
{ {
private readonly IClock _clock; private readonly IClock _clock;
private readonly IHttpContextAccessor _httpContextAccessor;
public DefaultHostEnvironment(IClock clock) public DefaultHostEnvironment(IClock clock, IHttpContextAccessor httpContextAccessor) {
{
_clock = clock; _clock = clock;
_httpContextAccessor = httpContextAccessor;
} }
public bool IsFullTrust public bool IsFullTrust
@@ -46,17 +48,18 @@ namespace Orchard.Environment
// If setting up extensions/modules requires an AppDomain restart, it's very unlikely the // If setting up extensions/modules requires an AppDomain restart, it's very unlikely the
// current request can be processed correctly. So, we redirect to the same URL, so that the // current request can be processed correctly. So, we redirect to the same URL, so that the
// new request will come to the newly started AppDomain. // new request will come to the newly started AppDomain.
if (HttpContext.Current != null) var httpContext = _httpContextAccessor.Current();
if (httpContext != null)
{ {
// Don't redirect posts... // Don't redirect posts...
if (HttpContext.Current.Request.RequestType == "GET") if (httpContext.Request.RequestType == "GET")
{ {
HttpContext.Current.Response.Redirect(HttpContext.Current.Request.ToUrlString(), true /*endResponse*/); httpContext.Response.Redirect(HttpContext.Current.Request.ToUrlString(), true /*endResponse*/);
} }
else else
{ {
HttpContext.Current.Response.WriteFile("~/Refresh.html"); httpContext.Response.WriteFile("~/Refresh.html");
HttpContext.Current.Response.End(); httpContext.Response.End();
} }
} }
} }