From be1bbc76c87abc6a377e19d166887df6437e2362 Mon Sep 17 00:00:00 2001 From: ruri Date: Wed, 29 May 2019 13:18:08 +0200 Subject: [PATCH] Content-Type custom header is now allowed for GET and HEAD. Empty POST data issue fixed. --- Extreme.Net.dll | Bin 123392 -> 122880 bytes RuriLib/Blocks/BlockRequest.cs | 13 +++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Extreme.Net.dll b/Extreme.Net.dll index c7aaca6155b4d39ba5595e6cf281cb0e454d863d..fadd81b5a7a3e2512bf3232d58126ec3a2e90738 100644 GIT binary patch delta 16666 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 Ge*X`m@BvT& diff --git a/RuriLib/Blocks/BlockRequest.cs b/RuriLib/Blocks/BlockRequest.cs index 644581c..796980c 100644 --- a/RuriLib/Blocks/BlockRequest.cs +++ b/RuriLib/Blocks/BlockRequest.cs @@ -391,7 +391,7 @@ namespace RuriLib var pData = string.Join(Environment.NewLine, postData .Split(new string[] { "\\n" }, StringSplitOptions.None) .Select(p => ReplaceValues(p, data))); - if (pData != "") + if (CanContainBody(method)) { if (encodeContent) { @@ -439,7 +439,7 @@ namespace RuriLib // Set headers data.Log(new LogEntry("Sent Headers:", Colors.DarkTurquoise)); - var fixedNames = Enum.GetNames(typeof(HttpHeader)).Select(n => n.ToLower()); + // var fixedNames = Enum.GetNames(typeof(HttpHeader)).Select(n => n.ToLower()); foreach (var header in CustomHeaders) { try @@ -448,8 +448,8 @@ namespace RuriLib var replacedKey = key.Replace("-", "").ToLower(); // Used to compare with the HttpHeader enum var val = ReplaceValues(header.Value, data); - if (replacedKey == "contenttype") { } // Disregard additional Content-Type headers - else if (fixedNames.Contains(replacedKey)) request.AddHeader((HttpHeader)Enum.Parse(typeof(HttpHeader), replacedKey, true), val); + if (replacedKey == "contenttype" && content != null) { continue; } // Disregard additional Content-Type headers + // else if (fixedNames.Contains(replacedKey)) request.AddHeader((HttpHeader)Enum.Parse(typeof(HttpHeader), replacedKey, true), val); else request.AddHeader(key, val); data.Log(new LogEntry(key + ": " + val, Colors.MediumTurquoise)); @@ -685,6 +685,11 @@ namespace RuriLib } return $"------WebKitFormBoundary{builder.ToString().ToLower()}"; } + + private static bool CanContainBody(HttpMethod method) + { + return method == HttpMethod.POST || method == HttpMethod.PUT || method == HttpMethod.DELETE; + } } ///