updated

kichalla · kichalla · commit d3055f71da61 · 2015-04-29T15:45:48.000-07:00
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs
@@ -15,7 +15,7 @@ public class ContentResult : ActionResult
     {
         private readonly MediaTypeHeaderValue DefaultContentType = new MediaTypeHeaderValue("text/plain")
         {
-            Charset = Encodings.UTF8EncodingWithoutBOM.WebName
+            Encoding = Encoding.UTF8
         };
 
         public string Content { get; set; }
@@ -31,45 +31,24 @@ public override async Task ExecuteResultAsync([NotNull] ActionContext context)
         {
             var response = context.HttpContext.Response;
 
-            MediaTypeHeaderValue contentTypeHeader = ContentType;
+            var contentTypeHeader = ContentType;
             Encoding encoding;
-            if(contentTypeHeader == null)
+            if (contentTypeHeader == null)
             {
                 contentTypeHeader = DefaultContentType;
-                encoding = Encodings.UTF8EncodingWithoutBOM;
+                encoding = DefaultContentType.Encoding;
             }
             else
             {
-                if(string.IsNullOrEmpty(contentTypeHeader.Charset))
+                if (contentTypeHeader.Encoding == null)
                 {
-                    encoding = Encodings.UTF8EncodingWithoutBOM;
-
                     // 1. Do not modify the user supplied content type
                     // 2. Parse here to handle parameters apart from charset
                     contentTypeHeader = MediaTypeHeaderValue.Parse(contentTypeHeader.ToString());
-                    contentTypeHeader.Charset = encoding.WebName;
-                }
-                else
-                {
-                    if (string.Equals(
-                        contentTypeHeader.Charset,
-                        Encodings.UTF8EncodingWithoutBOM.WebName,
-                        StringComparison.OrdinalIgnoreCase))
-                    {
-                        encoding = Encodings.UTF8EncodingWithoutBOM;
-                    }
-                    else if (string.Equals(
-                        contentTypeHeader.Charset,
-                        Encodings.UTF16EncodingLittleEndian.WebName,
-                        StringComparison.OrdinalIgnoreCase))
-                    {
-                        encoding = Encodings.UTF16EncodingLittleEndian;
-                    }
-                    else
-                    {
-                        encoding = new ResponseEncodingWrapper(Encoding.GetEncoding(contentTypeHeader.Charset));
-                    }
+                    contentTypeHeader.Encoding = Encoding.UTF8;
                 }
+
+                encoding = contentTypeHeader.Encoding;
             }
 
             response.ContentType = contentTypeHeader.ToString();
@@ -81,7 +60,7 @@ public override async Task ExecuteResultAsync([NotNull] ActionContext context)
 
             if (Content != null)
             {
-                await response.WriteAsync(Content, encoding);
+                await response.WriteAsync(Content, new ResponseEncodingWrapper(encoding));
             }
         }
     }
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewExecutor.cs
@@ -19,7 +19,7 @@ public static class ViewExecutor
         private const int BufferSize = 1024;
         private static readonly MediaTypeHeaderValue DefaultContentType = new MediaTypeHeaderValue("text/html")
         {
-            Charset = Encodings.UTF8EncodingWithoutBOM.WebName
+            Encoding = Encoding.UTF8
         };
 
         /// <summary>
@@ -38,52 +38,35 @@ public static async Task ExecuteAsync([NotNull] IView view,
         {
             var response = actionContext.HttpContext.Response;
 
-            MediaTypeHeaderValue contentTypeHeader = contentType;
+            var contentTypeHeader = contentType;
             Encoding encoding;
             if (contentTypeHeader == null)
             {
                 contentTypeHeader = DefaultContentType;
-                encoding = Encodings.UTF8EncodingWithoutBOM;
+                encoding = DefaultContentType.Encoding;
             }
             else
             {
-                if (string.IsNullOrEmpty(contentTypeHeader.Charset))
+                if (contentTypeHeader.Encoding == null)
                 {
-                    encoding = Encodings.UTF8EncodingWithoutBOM;
-
                     // 1. Do not modify the user supplied content type
                     // 2. Parse here to handle parameters apart from charset
                     contentTypeHeader = MediaTypeHeaderValue.Parse(contentTypeHeader.ToString());
-                    contentTypeHeader.Charset = encoding.WebName;
-                }
-                else
-                {
-                    if(string.Equals(
-                        contentTypeHeader.Charset,
-                        Encodings.UTF8EncodingWithoutBOM.WebName,
-                        StringComparison.OrdinalIgnoreCase))
-                    {
-                        encoding = Encodings.UTF8EncodingWithoutBOM;
-                    }
-                    else if(string.Equals(
-                        contentTypeHeader.Charset,
-                        Encodings.UTF16EncodingLittleEndian.WebName,
-                        StringComparison.OrdinalIgnoreCase))
-                    {
-                        encoding = Encodings.UTF16EncodingLittleEndian;
-                    }
-                    else
-                    {
-                        encoding = new ResponseEncodingWrapper(Encoding.GetEncoding(contentTypeHeader.Charset));
-                    }
+                    contentTypeHeader.Encoding = Encoding.UTF8;
                 }
+
+                encoding = contentTypeHeader.Encoding;
             }
 
             response.ContentType = contentTypeHeader.ToString();
 
             var wrappedStream = new StreamWrapper(response.Body);
 
-            using (var writer = new StreamWriter(wrappedStream, encoding, BufferSize, leaveOpen: true))
+            using (var writer = new StreamWriter(
+                wrappedStream,
+                new ResponseEncodingWrapper(encoding),
+                BufferSize,
+                leaveOpen: true))
             {
                 try
                 {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs
@@ -64,9 +64,9 @@ public async Task ContentResult_Response_NullContent_SetsContentTypeAndEncoding(
             var contentResult = new ContentResult
             {
                 Content = null,
-                ContentType = new MediaTypeHeaderValue("application/json")
+                ContentType = new MediaTypeHeaderValue("text/plain")
                 {
-                    Encoding = Encoding.UTF8
+                    Encoding = Encoding.UTF7
                 }
             };
             var httpContext = GetHttpContext();
@@ -76,7 +76,7 @@ public async Task ContentResult_Response_NullContent_SetsContentTypeAndEncoding(
             await contentResult.ExecuteResultAsync(actionContext);
 
             // Assert
-            Assert.Equal("application/json; charset=utf-8", httpContext.Response.ContentType);
+            Assert.Equal("text/plain; charset=utf-7", httpContext.Response.ContentType);
         }
 
         public static TheoryData<MediaTypeHeaderValue, string, byte[]> ContentResultContentTypeData

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class ContentResult : ActionResult`
`15`	`15`	`{`
`16`	`16`	`private readonly MediaTypeHeaderValue DefaultContentType = new MediaTypeHeaderValue("text/plain")`
`17`	`17`	`{`
`18`		`- Charset = Encodings.UTF8EncodingWithoutBOM.WebName`
	`18`	`+ Encoding = Encoding.UTF8`
`19`	`19`	`};`
`20`	`20`
`21`	`21`	`public string Content { get; set; }`
`@@ -31,45 +31,24 @@ public override async Task ExecuteResultAsync([NotNull] ActionContext context)`
`31`	`31`	`{`
`32`	`32`	`var response = context.HttpContext.Response;`
`33`	`33`
`34`		`- MediaTypeHeaderValue contentTypeHeader = ContentType;`
	`34`	`+ var contentTypeHeader = ContentType;`
`35`	`35`	`Encoding encoding;`
`36`		`- if(contentTypeHeader == null)`
	`36`	`+ if (contentTypeHeader == null)`
`37`	`37`	`{`
`38`	`38`	`contentTypeHeader = DefaultContentType;`
`39`		`- encoding = Encodings.UTF8EncodingWithoutBOM;`
	`39`	`+ encoding = DefaultContentType.Encoding;`
`40`	`40`	`}`
`41`	`41`	`else`
`42`	`42`	`{`
`43`		`- if(string.IsNullOrEmpty(contentTypeHeader.Charset))`
	`43`	`+ if (contentTypeHeader.Encoding == null)`
`44`	`44`	`{`
`45`		`- encoding = Encodings.UTF8EncodingWithoutBOM;`
`46`		`-`
`47`	`45`	`// 1. Do not modify the user supplied content type`
`48`	`46`	`// 2. Parse here to handle parameters apart from charset`
`49`	`47`	`contentTypeHeader = MediaTypeHeaderValue.Parse(contentTypeHeader.ToString());`
`50`		`- contentTypeHeader.Charset = encoding.WebName;`
`51`		`- }`
`52`		`- else`
`53`		`- {`
`54`		`- if (string.Equals(`
`55`		`- contentTypeHeader.Charset,`
`56`		`- Encodings.UTF8EncodingWithoutBOM.WebName,`
`57`		`- StringComparison.OrdinalIgnoreCase))`
`58`		`- {`
`59`		`- encoding = Encodings.UTF8EncodingWithoutBOM;`
`60`		`- }`
`61`		`- else if (string.Equals(`
`62`		`- contentTypeHeader.Charset,`
`63`		`- Encodings.UTF16EncodingLittleEndian.WebName,`
`64`		`- StringComparison.OrdinalIgnoreCase))`
`65`		`- {`
`66`		`- encoding = Encodings.UTF16EncodingLittleEndian;`
`67`		`- }`
`68`		`- else`
`69`		`- {`
`70`		`- encoding = new ResponseEncodingWrapper(Encoding.GetEncoding(contentTypeHeader.Charset));`
`71`		`- }`
	`48`	`+ contentTypeHeader.Encoding = Encoding.UTF8;`
`72`	`49`	`}`
	`50`	`+`
	`51`	`+ encoding = contentTypeHeader.Encoding;`
`73`	`52`	`}`
`74`	`53`
`75`	`54`	`response.ContentType = contentTypeHeader.ToString();`
`@@ -81,7 +60,7 @@ public override async Task ExecuteResultAsync([NotNull] ActionContext context)`
`81`	`60`
`82`	`61`	`if (Content != null)`
`83`	`62`	`{`
`84`		`- await response.WriteAsync(Content, encoding);`
	`63`	`+ await response.WriteAsync(Content, new ResponseEncodingWrapper(encoding));`
`85`	`64`	`}`
`86`	`65`	`}`
`87`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ public async Task ContentResult_Response_NullContent_SetsContentTypeAndEncoding(`
`64`	`64`	`var contentResult = new ContentResult`
`65`	`65`	`{`
`66`	`66`	`Content = null,`
`67`		`- ContentType = new MediaTypeHeaderValue("application/json")`
	`67`	`+ ContentType = new MediaTypeHeaderValue("text/plain")`
`68`	`68`	`{`
`69`		`- Encoding = Encoding.UTF8`
	`69`	`+ Encoding = Encoding.UTF7`
`70`	`70`	`}`
`71`	`71`	`};`
`72`	`72`	`var httpContext = GetHttpContext();`
`@@ -76,7 +76,7 @@ public async Task ContentResult_Response_NullContent_SetsContentTypeAndEncoding(`
`76`	`76`	`await contentResult.ExecuteResultAsync(actionContext);`
`77`	`77`
`78`	`78`	`// Assert`
`79`		`- Assert.Equal("application/json; charset=utf-8", httpContext.Response.ContentType);`
	`79`	`+ Assert.Equal("text/plain; charset=utf-7", httpContext.Response.ContentType);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public static TheoryData<MediaTypeHeaderValue, string, byte[]> ContentResultContentTypeData`