Added a condition for CF on Encode Parameters; Code Cleanup;

Author: Michael Hallett

RestSharp/Http.Async.cs

@@ -15,6 +15,7 @@
 #endregion
 
 using System;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using RestSharp.Extensions;
@@ -219,10 +220,8 @@ private long CalculateContentLength()
                 length += this.Encoding.GetByteCount(LINE_BREAK);
             }
 
-            foreach (var param in Parameters)
-            {
-                length += this.Encoding.GetByteCount(GetMultipartFormData(param));
-            }
+            length = this.Parameters.Aggregate(length,
+                (current, param) => current + this.Encoding.GetByteCount(this.GetMultipartFormData(param)));
 
             length += this.Encoding.GetByteCount(GetMultipartFooter());
             return length;
@@ -304,7 +303,6 @@ private static void TimeoutCallback(object state, bool timedOut)
 
         private static void GetRawResponseAsync(IAsyncResult result, Action<HttpWebResponse> callback)
         {
-            var response = new HttpResponse { ResponseStatus = ResponseStatus.None };
             HttpWebResponse raw;
 
             try

RestSharp/Http.cs

@@ -244,17 +244,17 @@ private void AddSharedHeaderActions()
 #endif
         }
 
-        private const string FormBoundary = "-----------------------------28947758029299";
+        private const string FORM_BOUNDARY = "-----------------------------28947758029299";
 
         private static string GetMultipartFormContentType()
         {
-            return string.Format("multipart/form-data; boundary={0}", FormBoundary);
+            return string.Format("multipart/form-data; boundary={0}", FORM_BOUNDARY);
         }
 
         private static string GetMultipartFileHeader(HttpFile file)
         {
             return string.Format("--{0}{4}Content-Disposition: form-data; name=\"{1}\"; filename=\"{2}\"{4}Content-Type: {3}{4}{4}",
-                FormBoundary, file.Name, file.FileName, file.ContentType ?? "application/octet-stream", LINE_BREAK);
+                FORM_BOUNDARY, file.Name, file.FileName, file.ContentType ?? "application/octet-stream", LINE_BREAK);
         }
 
         private string GetMultipartFormData(HttpParameter param)
@@ -263,12 +263,12 @@ private string GetMultipartFormData(HttpParameter param)
                 ? "--{0}{3}Content-Type: {1}{3}Content-Disposition: form-data; name=\"{1}\"{3}{3}{2}{3}"
                 : "--{0}{3}Content-Disposition: form-data; name=\"{1}\"{3}{3}{2}{3}";
 
-            return string.Format(format, FormBoundary, param.Name, param.Value, LINE_BREAK);
+            return string.Format(format, FORM_BOUNDARY, param.Name, param.Value, LINE_BREAK);
         }
 
         private static string GetMultipartFooter()
         {
-            return string.Format("--{0}--{1}", FormBoundary, LINE_BREAK);
+            return string.Format("--{0}--{1}", FORM_BOUNDARY, LINE_BREAK);
         }
 
         private readonly IDictionary<string, Action<HttpWebRequest, string>> restrictedHeaderActions;

RestSharp/RestClient.cs

@@ -321,7 +321,11 @@ public Uri BuildUri(IRestRequest request)
 
         private static string EncodeParameters(IEnumerable<Parameter> parameters)
         {
+#if !PocketPC
             return string.Join("&", parameters.Select(EncodeParameter).ToArray());
+#else
+            return string.Join("&", parameters.Select(x => EncodeParameter(x)).ToArray());
+#endif
         }
 
         private static string EncodeParameter(Parameter parameter)