Merge pull request #1723 from curit/overwrite-content-type

Overwrite Content-Type from headers

Author: horsdal

Diff for: src/Nancy.Tests/Unit/ResponseFixture.cs

@@ -154,6 +154,20 @@ public void Should_set_content_type_to_text_html_when_implicitly_cast_from_strin
             response.ContentType.ShouldEqual("text/html");
         }
 
+        [Fact] 
+        public void Should_overwrite_content_type_from_headers()
+        {
+            // Given
+            const string value = "test value";
+            Response response = value;
+
+            // When
+            response.Headers.Add("contenT-typE", "application/json");
+
+            // Then
+            response.ContentType.ShouldEqual("application/json");
+        }
+
         [Fact]
         public void Should_set_a_cookie_with_name_and_value()
         {

Diff for: src/Nancy/Response.cs

@@ -3,6 +3,7 @@ namespace Nancy
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Linq;
     using System.Threading.Tasks;
 
     using Cookies;
@@ -19,14 +20,16 @@ public class Response: IDisposable
         /// </summary>
         public static Action<Stream> NoBody = s => { };
 
+        private string contentType;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Response"/> class.
         /// </summary>
         public Response()
         {
             this.Contents = NoBody;
             this.ContentType = "text/html";
-            this.Headers = new Dictionary<string, string>();
+            this.Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             this.StatusCode = HttpStatusCode.OK;
             this.Cookies = new List<INancyCookie>(2);
         }
@@ -36,7 +39,11 @@ public Response()
         /// </summary>
         /// <value>The type of the content.</value>
         /// <remarks>The default value is <c>text/html</c>.</remarks>
-        public string ContentType { get; set; }
+        public string ContentType
+        {
+            get { return Headers.ContainsKey("content-type") ? Headers["content-type"] : this.contentType; }
+            set { this.contentType = value; }
+        }
 
         /// <summary>
         /// Gets the delegate that will render contents to the response stream.