From fbed6c291d218d1347636e967781d097a35c55de Mon Sep 17 00:00:00 2001 From: DKoro1 Date: Tue, 20 Nov 2018 05:02:05 +0300 Subject: [PATCH 1/2] fix cutting comma in headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс обрезки запятых в хедерах --- src/SocksSharp/Extensions/HttpHeadersExtensions.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/SocksSharp/Extensions/HttpHeadersExtensions.cs b/src/SocksSharp/Extensions/HttpHeadersExtensions.cs index 6a2232f..85e46a0 100644 --- a/src/SocksSharp/Extensions/HttpHeadersExtensions.cs +++ b/src/SocksSharp/Extensions/HttpHeadersExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Http.Headers; @@ -9,11 +9,11 @@ namespace SocksSharp.Extensions { internal static class HttpHeadersExtensions { - private static readonly string separator = " "; - + private static string separator; + public static string GetHeaderString(this HttpHeaders headers, string key) { - if(headers == null) + if (headers == null) { throw new ArgumentNullException(nameof(headers)); } @@ -28,11 +28,13 @@ public static string GetHeaderString(this HttpHeaders headers, string key) headers.TryGetValues(key, out values); - if(values != null && values.Count() > 1) + separator = key.Equals("User-Agent") ? " " : ", "; + + if (values != null && values.Count() > 1) { value = String.Join(separator, values.ToArray()); } - + return value; } } From 221d5cc1415985e81d5abdaff91a8e1a6a2afdd9 Mon Sep 17 00:00:00 2001 From: DKoro1 Date: Tue, 20 Nov 2018 07:03:40 +0300 Subject: [PATCH 2/2] fix cutting comma in headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс обрезки запятых в хедерах --- src/SocksSharp/Extensions/HttpHeadersExtensions.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/SocksSharp/Extensions/HttpHeadersExtensions.cs b/src/SocksSharp/Extensions/HttpHeadersExtensions.cs index 85e46a0..f7af1e9 100644 --- a/src/SocksSharp/Extensions/HttpHeadersExtensions.cs +++ b/src/SocksSharp/Extensions/HttpHeadersExtensions.cs @@ -9,8 +9,6 @@ namespace SocksSharp.Extensions { internal static class HttpHeadersExtensions { - private static string separator; - public static string GetHeaderString(this HttpHeaders headers, string key) { if (headers == null) @@ -28,7 +26,7 @@ public static string GetHeaderString(this HttpHeaders headers, string key) headers.TryGetValues(key, out values); - separator = key.Equals("User-Agent") ? " " : ", "; + string separator = key.Equals("User-Agent") ? " " : ", "; if (values != null && values.Count() > 1) {