[Fixes #112] BaseView.ExecuteAsync disposes the response stream

kichalla · kichalla · commit 8c8490fab49d · 2015-07-14T21:11:46.000-07:00
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.Internal;
@@ -52,7 +53,7 @@ public async Task ExecuteAsync(HttpContext context)
             Context = context;
             Request = Context.Request;
             Response = Context.Response;
-            Output = new StreamWriter(Response.Body);
+            Output = new StreamWriter(Response.Body, Encoding.UTF8, 4096, leaveOpen: true);
             HtmlEncoder = context.ApplicationServices.GetHtmlEncoder();
             await ExecuteAsync();
             Output.Dispose();
@@ -199,7 +200,7 @@ protected void Write(HelperResult result)
         /// <param name="value">The <see cref="object"/> to write.</param>
         /// <remarks>
         /// <see cref="HelperResult.WriteTo(TextWriter)"/> is invoked for <see cref="HelperResult"/> types.
-        /// For all other types, the encoded result of <see cref="object.ToString"/> is written to the 
+        /// For all other types, the encoded result of <see cref="object.ToString"/> is written to the
         /// <paramref name="writer"/>.
         /// </remarks>
         protected void WriteTo(TextWriter writer, object value)
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cs
@@ -51,7 +51,7 @@ public override async Task ExecuteAsync()
 #line 10 "CompilationErrorPage.cshtml"
   
     Response.StatusCode = 500;
-    Response.ContentType = "text/html";
+    Response.ContentType = "text/html; charset=utf-8";
     Response.ContentLength = null; // Clear any prior Content-Length
 
 #line default
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/CompilationErrorPage.cshtml
@@ -9,7 +9,7 @@
 }
 @{
     Response.StatusCode = 500;
-    Response.ContentType = "text/html";
+    Response.ContentType = "text/html; charset=utf-8";
     Response.ContentLength = null; // Clear any prior Content-Length
 }
 <!DOCTYPE html>
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -57,7 +57,7 @@ public override async Task ExecuteAsync()
   
     Response.StatusCode = 500;
     // TODO: Response.ReasonPhrase = "Internal Server Error";
-    Response.ContentType = "text/html";
+    Response.ContentType = "text/html; charset=utf-8";
     Response.ContentLength = null; // Clear any prior Content-Length
     string location = string.Empty;
 
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cshtml
@@ -15,7 +15,7 @@
 @{
     Response.StatusCode = 500;
     // TODO: Response.ReasonPhrase = "Internal Server Error";
-    Response.ContentType = "text/html";
+    Response.ContentType = "text/html; charset=utf-8";
     Response.ContentLength = null; // Clear any prior Content-Length
     string location = string.Empty;
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`}`
`10`	`10`	`@{`
`11`	`11`	`Response.StatusCode = 500;`
`12`		`- Response.ContentType = "text/html";`
	`12`	`+ Response.ContentType = "text/html; charset=utf-8";`
`13`	`13`	`Response.ContentLength = null; // Clear any prior Content-Length`
`14`	`14`	`}`
`15`	`15`	`<!DOCTYPE html>`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`@{`
`16`	`16`	`Response.StatusCode = 500;`
`17`	`17`	`// TODO: Response.ReasonPhrase = "Internal Server Error";`
`18`		`- Response.ContentType = "text/html";`
	`18`	`+ Response.ContentType = "text/html; charset=utf-8";`
`19`	`19`	`Response.ContentLength = null; // Clear any prior Content-Length`
`20`	`20`	`string location = string.Empty;`
`21`	`21`	`}`