Stop enabling accept_encoding for all (#117)

lexiforest · web-flow · commit ba8b1a13e394 · 2025-04-13T22:45:29.000+08:00
diff --git a/patches/curl.patch b/patches/curl.patch
@@ -392,7 +392,7 @@ index fb162a30d..f1429fe2f 100644
  bool Curl_dynhds_contains(struct dynhds *dynhds,
                            const char *name, size_t namelen);
 diff --git a/lib/easy.c b/lib/easy.c
-index aa1bedec3..4386e0bab 100644
+index aa1bedec3..c25631d77 100644
 --- a/lib/easy.c
 +++ b/lib/easy.c
 @@ -75,6 +75,8 @@
@@ -404,7 +404,7 @@ index aa1bedec3..4386e0bab 100644
  
  #include "easy_lock.h"
  
-@@ -344,6 +346,249 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
+@@ -344,6 +346,244 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
    return rc;
  }
  
@@ -594,11 +594,6 @@ index aa1bedec3..4386e0bab 100644
 +    ret = curl_easy_setopt(data, CURLOPT_STREAM_EXCLUSIVE, opts->http2_stream_exclusive);
 +  }
 +
-+  /* FIXME: Always enable all supported compressions. */
-+  ret = curl_easy_setopt(data, CURLOPT_ACCEPT_ENCODING, "");
-+  if(ret)
-+    return ret;
-+
 +  return CURLE_OK;
 +}
 +
@@ -654,7 +649,7 @@ index aa1bedec3..4386e0bab 100644
  /*
   * curl_easy_init() is the external interface to alloc, setup and init an
   * easy handle that is returned. If anything goes wrong, NULL is returned.
-@@ -352,6 +597,8 @@ CURL *curl_easy_init(void)
+@@ -352,6 +592,8 @@ CURL *curl_easy_init(void)
  {
    CURLcode result;
    struct Curl_easy *data;
@@ -663,7 +658,7 @@ index aa1bedec3..4386e0bab 100644
  
    /* Make sure we inited the global SSL stuff */
    global_init_lock();
-@@ -374,6 +621,29 @@ CURL *curl_easy_init(void)
+@@ -374,6 +616,29 @@ CURL *curl_easy_init(void)
      return NULL;
    }
  
@@ -693,7 +688,7 @@ index aa1bedec3..4386e0bab 100644
    return data;
  }
  
-@@ -1010,6 +1280,13 @@ CURL *curl_easy_duphandle(CURL *d)
+@@ -1010,6 +1275,13 @@ CURL *curl_easy_duphandle(CURL *d)
      outcurl->state.referer_alloc = TRUE;
    }
  
@@ -707,7 +702,7 @@ index aa1bedec3..4386e0bab 100644
    /* Reinitialize an SSL engine for the new handle
     * note: the engine name has already been copied by dupset */
    if(outcurl->set.str[STRING_SSL_ENGINE]) {
-@@ -1096,6 +1373,9 @@ fail:
+@@ -1096,6 +1368,9 @@ fail:
   */
  void curl_easy_reset(CURL *d)
  {
@@ -717,7 +712,7 @@ index aa1bedec3..4386e0bab 100644
    struct Curl_easy *data = d;
    Curl_req_hard_reset(&data->req, data);
  
-@@ -1121,6 +1401,23 @@ void curl_easy_reset(CURL *d)
+@@ -1121,6 +1396,23 @@ void curl_easy_reset(CURL *d)
  #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_DIGEST_AUTH)
    Curl_http_auth_cleanup_digest(data);
  #endif
diff --git a/tests/test_impersonate.py b/tests/test_impersonate.py
@@ -348,53 +348,6 @@ async def test_http2_headers(
     assert equals, msg
 
 
-@pytest.mark.parametrize(
-    "curl_binary, env_vars, ld_preload, expected_signature",
-    CURL_BINARIES_AND_SIGNATURES,
-)
-def test_content_encoding(
-    pytestconfig,
-    curl_binary,
-    env_vars,
-    ld_preload,
-    expected_signature,
-    test_urls,
-):
-    """
-    Ensure the output of curl-impersonate is correct, i.e. that compressed
-    responses are decoded correctly.
-    """
-    curl_binary = os.path.join(
-        pytestconfig.getoption("install_dir"), "bin", curl_binary
-    )
-    if ld_preload:
-        # Injecting libcurl-impersonate with LD_PRELOAD is supported on
-        # Linux only. On Mac there is DYLD_INSERT_LIBRARIES but it
-        # requires more work to be functional.
-        if not sys.platform.startswith("linux"):
-            pytest.skip()
-
-        _set_ld_preload(
-            env_vars,
-            os.path.join(pytestconfig.getoption("install_dir"), "lib", ld_preload),
-        )
-
-    output = tempfile.mkstemp()[1]
-    ret = _run_curl(
-        curl_binary,
-        env_vars=env_vars,
-        extra_args=None,
-        urls=[test_urls[0]],
-        output=output,
-    )
-    assert ret == 0
-
-    with open(output, "r") as f:
-        body = f.read()
-        assert (
-            "<!DOCTYPE html>" in body or "<html>" in body or "<!doctype html>" in body
-        )
-
 
 @pytest.mark.parametrize(
     "curl_binary, env_vars, ld_preload",
