Merge pull request #825 from Glimpse/502-async-issues-with-preSendReq…

…uestHeaders Support For AspNetSynchronizationContext
Glimpse · Jul 17, 2014 · c61c88c · c61c88c
2 parents 93256e0 + dd11a2e
commit c61c88c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/source/Glimpse.AspNet/AspNetFrameworkProvider.cs b/source/Glimpse.AspNet/AspNetFrameworkProvider.cs
@@ -71,16 +71,13 @@ private static HttpContextBase TryGetOrCaptureLogicalContext()
 
         public void SetHttpResponseHeader(string name, string value)
         {
-            if (!Context.HeadersSent())
+            try
             {
-                try
-                {
-                    Context.Response.AppendHeader(name, value);
-                }
-                catch (Exception exception)
-                {
-                    Logger.Error("Exception setting Http response header '{0}' with value '{1}'.", exception, name, value);
-                }
+                Context.Response.AppendHeader(name, value);
+            }
+            catch (Exception exception)
+            {
+                Logger.Error("Exception setting Http response header '{0}' with value '{1}'.", exception, name, value);
             }
         }
 

diff --git a/source/Glimpse.AspNet/Extensions/HttpContextExtensions.cs b/source/Glimpse.AspNet/Extensions/HttpContextExtensions.cs
@@ -5,8 +5,6 @@ namespace Glimpse.AspNet.Extensions
 {
     public static class HttpContextExtensions
     {
-        private const string HeadersSentKey = "__GlimpseHttpHeadersSent";
-
         public static string GenerateGlimpseScriptTags(this HttpContextBase context)
         {
             var generateScripts = context.Items["__GlimpseClientScriptsStrategy"] as Func<Guid?, string>;
@@ -18,17 +16,5 @@ public static string GenerateGlimpseScriptTags(this HttpContextBase context)
 
             return generateScripts(null); // null means to use the current request id
         }
-
-        internal static void HeadersSent(this HttpContextBase context, bool value)
-        {
-            context.Items[HeadersSentKey] = value;
-        }
-
-        internal static bool HeadersSent(this HttpContextBase context)
-        {
-            var result = context.Items[HeadersSentKey] as bool?;
-
-            return result.HasValue ? result.Value : false;
-        }
     }
 }
diff --git a/source/Glimpse.AspNet/HttpModule.cs b/source/Glimpse.AspNet/HttpModule.cs
@@ -74,7 +74,6 @@ internal void Init(HttpApplicationBase httpApplication)
                 httpApplication.PostAcquireRequestState += (context, e) => BeginSessionAccess(WithTestable(context));
                 httpApplication.PostRequestHandlerExecute += (context, e) => EndSessionAccess(WithTestable(context));
                 httpApplication.PostReleaseRequestState += (context, e) => EndRequest(WithTestable(context));
-                httpApplication.PreSendRequestHeaders += (context, e) => SendHeaders(WithTestable(context));
             }
         }
 
@@ -115,11 +114,6 @@ internal void EndRequest(HttpContextBase httpContext)
             runtime.EndRequest();
         }
 
-        internal void SendHeaders(HttpContextBase httpContext)
-        {
-            httpContext.HeadersSent(true);
-        }
-
         private static HttpContextBase WithTestable(object sender)
         {
             var httpApplication = sender as HttpApplication;