Merge pull request aspnet#33 from AspNetSmurfLab/master

Fix error & debug middleware
benaadams · Dec 2, 2015 · e742afb · e742afb
2 parents 4a72030 + f7bbc7f
commit e742afb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Benchmarks/DebugInfoPageMiddleware.cs b/src/Benchmarks/DebugInfoPageMiddleware.cs
@@ -48,16 +48,17 @@ public async Task Invoke(HttpContext httpContext)
                 await httpContext.Response.WriteAsync($"<li>Configuration: {_configurationName}</li>");
                 await httpContext.Response.WriteAsync($"<li>Server: {_hostingEnv.Configuration["server"]}</li>");
                 await httpContext.Response.WriteAsync($"<li>Server URLs: {_hostingEnv.Configuration["server.urls"]}</li>");
+                await httpContext.Response.WriteAsync($"<li>Supports Send File: {httpContext.Response.SupportsSendFile()}</li>");
 
-                await httpContext.Response.WriteAsync($"<li>Server features:<ol>");
+                await httpContext.Response.WriteAsync($"<li>Server features:<ul>");
+
                 foreach (var feature in httpContext.Features)
                 {
                     await httpContext.Response.WriteAsync($"<li>{feature.Key.Name}</li>");
                 }
-                await httpContext.Response.WriteAsync($"</ol></li>");
+                await httpContext.Response.WriteAsync($"</ul></li>");
 
                 await httpContext.Response.WriteAsync("</ul>");
-
                 return;
             }
 

diff --git a/src/Benchmarks/ErrorHandlerMiddleware.cs b/src/Benchmarks/ErrorHandlerMiddleware.cs
@@ -25,8 +25,13 @@ public async Task Invoke(HttpContext httpContext)
             }
             catch (Exception ex)
             {
-                httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
-                httpContext.Response.ContentType = "text/html";
+                if (!httpContext.Response.HasStarted)
+                {
+                    httpContext.Response.Clear();
+                    httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
+                    httpContext.Response.ContentType = "text/html";
+                }
+
                 await httpContext.Response.WriteAsync($"<pre style='color:red'>{ex.ToString()}</pre>");
             }
         }