Merge 364c54f into 0478f21

Author: Wintereise

Titanium.Web.Proxy/Http/HttpWebClient.cs

@@ -16,6 +16,7 @@ namespace Titanium.Web.Proxy.Http
     /// </summary>
     public class HttpWebClient
     {
+        private const string CRLF = "\r\n";
 
         internal HttpWebClient(Request request = null, Response response = null)
         {
@@ -103,26 +104,29 @@ await writer.WriteLineAsync(Request.CreateRequestLine(Request.Method,
                 Request.HttpVersion), cancellationToken);
 
             var headerBuilder = new StringBuilder();
+            
             // Send Authentication to Upstream proxy if needed
             if (!isTransparent && upstreamProxy != null
                                && ServerConnection.IsHttps == false
                                && !string.IsNullOrEmpty(upstreamProxy.UserName)
                                && upstreamProxy.Password != null)
             {
-                headerBuilder.AppendLine(HttpHeader.ProxyConnectionKeepAlive.ToString());
-                headerBuilder.AppendLine(HttpHeader.GetProxyAuthorizationHeader(upstreamProxy.UserName, upstreamProxy.Password).ToString());
+                headerBuilder.AppendFormat("{0}{1}", HttpHeader.ProxyConnectionKeepAlive, CRLF);
+                headerBuilder.AppendFormat("{0}{1}",
+                    HttpHeader.GetProxyAuthorizationHeader(upstreamProxy.UserName, upstreamProxy.Password), CRLF);
             }
 
             // write request headers
             foreach (var header in Request.Headers)
             {
                 if (isTransparent || header.Name != KnownHeaders.ProxyAuthorization)
                 {
-                    headerBuilder.AppendLine(header.ToString());
+                    headerBuilder.AppendFormat("{0}{1}", header, CRLF);
                 }
             }
 
-            headerBuilder.AppendLine();
+            headerBuilder.Append(CRLF);
+            
             await writer.WriteAsync(headerBuilder.ToString(), cancellationToken);
 
             if (enable100ContinueBehaviour)