summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-05-22 18:42:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-23 01:24:12 (GMT)
commit1a53e692afd417897d76bff4ce54bc05a3a976b2 (patch)
tree769da303261113dfd7a23709f28985b3fdc2ec7e /http.c
parentccdcbd54c4475c2238b310f7113ab3075b5abc9c (diff)
downloadgit-1a53e692afd417897d76bff4ce54bc05a3a976b2.zip
git-1a53e692afd417897d76bff4ce54bc05a3a976b2.tar.gz
git-1a53e692afd417897d76bff4ce54bc05a3a976b2.tar.bz2
remote-curl: accept all encodings supported by curl
Configure curl to accept all encodings which curl supports instead of only accepting gzip responses. This fixes an issue when using an installation of curl which is built without the "zlib" feature. Since aa90b9697 (Enable info/refs gzip decompression in HTTP client, 2012-09-19) we end up requesting "gzip" encoding anyway despite libcurl not being able to decode it. Worse, instead of getting a clear error message indicating so, we end up falling back to "dumb" http, producing a confusing and difficult to debug result. Since curl doesn't do any checking to verify that it supports the a requested encoding, instead set the curl option `CURLOPT_ENCODING` with an empty string indicating that curl should send an "Accept-Encoding" header containing only the encodings supported by curl. Reported-by: Anton Golubev <anton.golubev@gmail.com> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index fed13b2..709150f 100644
--- a/http.c
+++ b/http.c
@@ -1788,7 +1788,7 @@ static int http_request(const char *url,
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
- curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
+ curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
ret = run_one_slot(slot, &results);