From 59a421876d86bd6812e07af00fea8858764a6d87 Mon Sep 17 00:00:00 2001
From: ruri <ruridev@protonmail.com>
Date: Wed, 29 May 2019 13:32:37 +0200
Subject: [PATCH] Accept-Encoding is now toggleable and can also be defined in
 Custom Headers when turned off.

---
 Extreme.Net.dll                               | Bin 122880 -> 122880 bytes
 OpenBullet/LSDoc.xml                          |   2 +-
 .../Pages/StackerBlocks/PageBlockRequest.xaml |   7 +++++++
 OpenBullet/SyntaxHelper.xml                   |   2 +-
 RuriLib/Blocks/BlockRequest.cs                |   8 +++++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Extreme.Net.dll b/Extreme.Net.dll
index fadd81b5a7a3e2512bf3232d58126ec3a2e90738..a427744980693658d35027024cb00a0505422e36 100644
GIT binary patch
delta 4940
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

delta 4942
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
Bq)7k(

diff --git a/OpenBullet/LSDoc.xml b/OpenBullet/LSDoc.xml
index 4b0fa67..9cd5244 100644
--- a/OpenBullet/LSDoc.xml
+++ b/OpenBullet/LSDoc.xml
@@ -271,7 +271,7 @@ KEYCHECK BanOnToCheck=False
 This will spawn and execute a Request Block.
 
 Syntax (expanded for readability):
-REQUEST METHOD "URL" [AutoRedirect?] [ReadResponseSource?] [ParseQuery?] [EncodeContent?]
+REQUEST METHOD "URL" [AcceptEncoding?] [AutoRedirect?] [ReadResponseSource?] [ParseQuery?] [EncodeContent?]
   [STANDARD / MULTIPART / BASICAUTH]
   [CONTENT "postdata"]
   [CONTENTTYPE "ctype"]
diff --git a/OpenBullet/Pages/StackerBlocks/PageBlockRequest.xaml b/OpenBullet/Pages/StackerBlocks/PageBlockRequest.xaml
index ff12ee9..dd5d375 100644
--- a/OpenBullet/Pages/StackerBlocks/PageBlockRequest.xaml
+++ b/OpenBullet/Pages/StackerBlocks/PageBlockRequest.xaml
@@ -25,17 +25,24 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30" />
                     <RowDefinition Height="30" />
+                    <RowDefinition Height="30" />
                 </Grid.RowDefinitions>
 
+                <!-- Row 1 -->
                 <DockPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0">
                     <Label Content="Method:"/>
                     <ComboBox x:Name="methodCombobox" SelectionChanged="methodCombobox_SelectionChanged"/>
                 </DockPanel>
 
                 <CheckBox Grid.Column="2" Grid.Row="0" Content="Auto Redirect" IsChecked="{Binding AutoRedirect}" VerticalContentAlignment="Center" />
+                
+                <!-- Row 2 -->
                 <CheckBox Grid.Column="0" Grid.Row="1" Content="Read Resp. Source" IsChecked="{Binding ReadResponseSource}" VerticalContentAlignment="Center" />
                 <CheckBox Grid.Column="1" Grid.Row="1" Content="Parse GET Query" IsChecked="{Binding ParseQuery}" VerticalContentAlignment="Center"/>
                 <CheckBox Grid.Column="2" Grid.Row="1" Content="Encode Content" IsChecked="{Binding EncodeContent}" VerticalContentAlignment="Center"/>
+                
+                <!-- Row 3 -->
+                <CheckBox Grid.Column="0" Grid.Row="2" Content="Accept-Encoding" IsChecked="{Binding AcceptEncoding}" VerticalContentAlignment="Center"/>
             </Grid>
 
             <DockPanel Margin="0 5 0 0">
diff --git a/OpenBullet/SyntaxHelper.xml b/OpenBullet/SyntaxHelper.xml
index e517958..e3e50d4 100644
--- a/OpenBullet/SyntaxHelper.xml
+++ b/OpenBullet/SyntaxHelper.xml
@@ -10,7 +10,7 @@ KEYCHECK [BanOn4XX?] [BanOnToCheck?]
   ]*
   </item>
   <item name="REQUEST">
-REQUEST METHOD "URL" [AutoRedirect?] [ReadResponseSource?] [ParseQuery?] [EncodeContent?]
+REQUEST METHOD "URL" [AcceptEncoding?] [AutoRedirect?] [ReadResponseSource?] [ParseQuery?] [EncodeContent?]
   [STANDARD / MULTIPART / BASICAUTH]
   [CONTENT "postdata"]
   [CONTENTTYPE "ctype"]
diff --git a/RuriLib/Blocks/BlockRequest.cs b/RuriLib/Blocks/BlockRequest.cs
index 796980c..188ef8c 100644
--- a/RuriLib/Blocks/BlockRequest.cs
+++ b/RuriLib/Blocks/BlockRequest.cs
@@ -111,6 +111,10 @@ namespace RuriLib
         /// <summary>Whether to URL encode the content before sending it.</summary>
         public bool EncodeContent { get { return encodeContent; } set { encodeContent = value; OnPropertyChanged(); } }
 
+        private bool acceptEncoding = true;
+        /// <summary>Whether to automatically generate an Accept-Encoding header.</summary>
+        public bool AcceptEncoding { get { return acceptEncoding; } set { acceptEncoding = value; OnPropertyChanged(); } }
+
         // Multipart
         private string multipartBoundary = "";
         /// <summary>The boundary that separates multipart contents.</summary>
@@ -253,6 +257,7 @@ namespace RuriLib
                 .Token("REQUEST")
                 .Token(Method)
                 .Literal(Url)
+                .Boolean(AcceptEncoding, "AcceptEncoding")
                 .Boolean(AutoRedirect, "AutoRedirect")
                 .Boolean(ReadResponseSource, "ReadResponseSource")
                 .Boolean(ParseQuery, "ParseQuery")
@@ -346,7 +351,7 @@ namespace RuriLib
             var timeout = data.GlobalSettings.General.RequestTimeout * 1000;
             request.IgnoreProtocolErrors = true;
             request.AllowAutoRedirect = autoRedirect;
-            request.EnableEncodingContent = true;
+            request.EnableEncodingContent = acceptEncoding;
             request.ReadWriteTimeout = timeout;
             request.ConnectTimeout = timeout;
             request.KeepAlive = true;
@@ -449,6 +454,7 @@ namespace RuriLib
                     var val = ReplaceValues(header.Value, data);
 
                     if (replacedKey == "contenttype" && content != null) { continue; } // Disregard additional Content-Type headers
+                    if (replacedKey == "acceptencoding" && acceptEncoding) { continue; } // Disregard additional Accept-Encoding headers
                     // else if (fixedNames.Contains(replacedKey)) request.AddHeader((HttpHeader)Enum.Parse(typeof(HttpHeader), replacedKey, true), val);
                     else request.AddHeader(key, val);