Issue 4916 - Request compression in CURL WebRequest.

adblockplus · Mar 2, 2017 · 8ba0148 · 8ba0148
1 parent 70ac246
commit 8ba0148
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/DefaultWebRequestCurl.cpp b/src/DefaultWebRequestCurl.cpp
@@ -138,6 +138,8 @@ AdblockPlus::ServerResponse AdblockPlus::DefaultWebRequest::GET(
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ReceiveData);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &responseText);
+    // Request compressed data. Using any supported aglorithm
+    curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "");
     curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, ReceiveHeader);
     curl_easy_setopt(curl, CURLOPT_HEADERDATA, &headerData);
 

diff --git a/test/WebRequest.cpp b/test/WebRequest.cpp
@@ -89,6 +89,9 @@ TEST_F(DefaultWebRequestTest, RealWebRequest)
   ASSERT_EQ(200, jsEngine->Evaluate("foo.responseStatus")->AsInt());
   ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("foo.responseText.substr(0, 14)")->AsString());
   ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type'].substr(0, 10)")->AsString());
+#if defined(HAVE_CURL)
+  ASSERT_EQ("gzip", jsEngine->Evaluate("foo.responseHeaders['content-encoding'].substr(0, 4)")->AsString());
+#endif
   ASSERT_TRUE(jsEngine->Evaluate("foo.responseHeaders['location']")->IsUndefined());
 }