- Add "Content-*" parameters to the HttpContent instead of the request.

- Added unit tests

Author: fubar-coder

RestSharp.Portable.Test/IssueTests.cs

@@ -135,6 +135,38 @@ public void TestIssue25()
             }
         }
 
+        [Fact(DisplayName = "Issue 29 ContentCollectionMode = MultiPart")]
+        public async Task TestIssue29_CollectionModeMultiPart()
+        {
+            using (var client = new RestClient("http://httpbin.org/"))
+            {
+                var req = new RestRequest("post", HttpMethod.Post);
+                req.AddParameter("a", "value-of-a");
+                req.ContentCollectionMode = ContentCollectionMode.MultiPart;
+                var resp = await client.Execute<RequestResponse>(req);
+                Assert.NotNull(resp.Data);
+                Assert.NotNull(resp.Data.Form);
+                Assert.True(resp.Data.Form.ContainsKey("a"));
+                Assert.Equal("value-of-a", resp.Data.Form["a"]);
+            }
+        }
+
+        [Fact(DisplayName = "Issue 29 ContentType as Parameter")]
+        public async Task TestIssue29_ContentTypeParameter()
+        {
+            using (var client = new RestClient("http://httpbin.org/"))
+            {
+                var req = new RestRequest("post", HttpMethod.Post);
+                req.AddParameter("a", "value-of-a");
+                req.AddHeader("content-type", "application/x-www-form-urlencoded;charset=utf-8");
+                var resp = await client.Execute<RequestResponse>(req);
+                Assert.NotNull(resp.Data);
+                Assert.NotNull(resp.Data.Form);
+                Assert.True(resp.Data.Form.ContainsKey("a"));
+                Assert.Equal("value-of-a", resp.Data.Form["a"]);
+            }
+        }
+
         [Fact(DisplayName = "Issue 32")]
         public async Task TestIssue32()
         {

RestSharp.Portable/HttpClientImpl/DefaultHttpClientFactory.cs

@@ -163,7 +163,7 @@ protected virtual HttpMethod GetHttpMethod(IRestClient client, IRestRequest requ
         /// <returns>The modified HTTP request message</returns>
         protected virtual HttpRequestMessage AddHttpHeaderParameters(HttpRequestMessage message, IRestRequest request)
         {
-            foreach (var param in request.Parameters.Where(x => x.Type == ParameterType.HttpHeader))
+            foreach (var param in request.Parameters.Where(x => x.Type == ParameterType.HttpHeader && !x.IsContentParameter()))
             {
                 if (message.Headers.Contains(param.Name))
                     message.Headers.Remove(param.Name);

RestSharp.Portable/ParameterExtensions.cs

@@ -57,6 +57,16 @@ public static IEnumerable<FileParameter> GetFileParameters(this IEnumerable<Para
             return parameters.OfType<FileParameter>();
         }
 
+        /// <summary>
+        /// Is the given parameter a content parameter?
+        /// </summary>
+        /// <param name="parameter">the parameter to test</param>
+        /// <returns>true when the parameter is a content parameter</returns>
+        public static bool IsContentParameter(this Parameter parameter)
+        {
+            return !string.IsNullOrEmpty(parameter.Name) && parameter.Name.StartsWith("Content-", StringComparison.OrdinalIgnoreCase);
+        }
+
         internal static string ToEncodedString(this Parameter parameter, bool spaceAsPlus = false)
         {
             switch (parameter.Type)

RestSharp.Portable/RestClient.cs

@@ -479,6 +479,24 @@ private async Task<HttpResponseMessage> ExecuteRequest(IRestRequest request, Can
                     if (bodyData != null)
                         message.Content = bodyData;
 
+                    if (message.Content != null)
+                    {
+                        var content = message.Content;
+                        foreach (var param in request.Parameters.Where(x => x.Type == ParameterType.HttpHeader && x.IsContentParameter()))
+                        {
+                            if (content.Headers.Contains(param.Name))
+                                content.Headers.Remove(param.Name);
+                            if (param.ValidateOnAdd)
+                            {
+                                content.Headers.Add(param.Name, param.AsString());
+                            }
+                            else
+                            {
+                                content.Headers.TryAddWithoutValidation(param.Name, param.AsString());
+                            }
+                        }
+                    }
+
                     if (EnvironmentUtilities.IsSilverlight && message.Method == HttpMethod.Get)
                         _httpClient.DefaultRequestHeaders.Accept.Clear();