[OData] Ensure charset gets set in the response headers

2 files changed, 18 insertions, 0 deletions

diff --git a/src/System.Web.Http.OData/OData/Formatter/ODataMediaTypeFormatter.cs b/src/System.Web.Http.OData/OData/Formatter/ODataMediaTypeFormatter.cs
index f4e1be4b..47c3ffd6 100644
--- a/src/System.Web.Http.OData/OData/Formatter/ODataMediaTypeFormatter.cs
+++ b/src/System.Web.Http.OData/OData/Formatter/ODataMediaTypeFormatter.cs
@@ -140,6 +140,7 @@ namespace System.Web.Http.OData.Formatter
                 if (String.Equals("Content-Type", pair.Key, StringComparison.OrdinalIgnoreCase))
                 {
                     headers.ContentType = MediaTypeHeaderValue.Parse(pair.Value);
+                    headers.ContentType.CharSet = Encoding.UTF8.WebName;
                 }
                 else
                 {
diff --git a/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs b/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs
index 51158bb2..fffe701f 100644
--- a/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs
+++ b/test/System.Web.Http.OData.Test/OData/Formatter/ODataMediaTypeFormatterTests.cs
@@ -96,6 +96,23 @@ namespace System.Web.Http.OData.Formatter
             Assert.Equal(headervalues, new string[] { expectedDataServiceVersion + ";" });
         }
 
+        [Theory]
+        [InlineData("application/atom+xml")]
+        [InlineData("application/json")]
+        [InlineData("application/xml")]
+        public void SetDefaultContentHeaders_SetsRightContentTypeCharSet(string mediaType)
+        {
+            HttpRequestMessage request = new HttpRequestMessage();
+            HttpContentHeaders contentHeaders = new StringContent("").Headers;
+
+            new ODataMediaTypeFormatter()
+                .GetPerRequestFormatterInstance(typeof(int), request, MediaTypeHeaderValue.Parse(mediaType))
+                .SetDefaultContentHeaders(typeof(int), contentHeaders, MediaTypeHeaderValue.Parse(mediaType));
+
+            Assert.NotNull(contentHeaders.ContentType.CharSet);
+            Assert.Equal("utf-8", contentHeaders.ContentType.CharSet);
+        }
+
         [Fact]
         public void TryGetInnerTypeForDelta_ChangesRefToGenericParameter_ForDeltas()
         {