Merge branch 'uxsoft-contenttype-overwritten-by-body-type' into develop

Author: alexeyzimarev

RestSharp.IntegrationTests/StatusCodeTests.cs

@@ -141,10 +141,35 @@ public void Reports_5xx_Status_Code_Success_Accurately()
 
             Assert.IsFalse(response.IsSuccessful);
         }
+
+        [Test]
+        public void ContentType_Additional_Information()
+        {
+            _server.SetHandler(Handlers.Generic<ResponseHandler>());
+            var request = new RestRequest(Method.POST)
+            {
+                RequestFormat = DataFormat.Json,
+                Resource = "contenttype_odata"
+            };
+            request.AddBody("bodyadsodajjd");
+            request.AddHeader("X-RequestDigest", "xrequestdigestasdasd");
+            request.AddHeader("Accept", "application/json; odata=verbose");
+            request.AddHeader("Content-Type", "application/json; odata=verbose");
+
+            IRestResponse<Response> response = _client.Execute<Response>(request);
+
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+        }
     }
 
     public class ResponseHandler
     {
+        private void contenttype_odata(HttpListenerContext context)
+        {
+            bool hasCorrectHeader = context.Request.Headers["Content-Type"] == "application/json; odata=verbose";
+            context.Response.StatusCode = hasCorrectHeader ? 200 : 400;
+        }
+
         private void error(HttpListenerContext context)
         {
             context.Response.StatusCode = 400;

RestSharp/Http.cs

@@ -316,18 +316,23 @@ private string EncodeParameters()
 
         private void PreparePostBody(HttpWebRequest webRequest)
         {
+            bool needsContentType = String.IsNullOrEmpty(webRequest.ContentType);
+
             if (HasFiles || AlwaysMultipartFormData)
             {
-                webRequest.ContentType = GetMultipartFormContentType();
+                if (needsContentType)
+                    webRequest.ContentType = GetMultipartFormContentType();
             }
             else if (HasParameters)
             {
-                webRequest.ContentType = "application/x-www-form-urlencoded";
+                if (needsContentType)
+                    webRequest.ContentType = "application/x-www-form-urlencoded";
                 RequestBody = EncodeParameters();
             }
             else if (HasBody)
             {
-                webRequest.ContentType = RequestContentType;
+                if (needsContentType)
+                    webRequest.ContentType = RequestContentType;
             }
         }