diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2021-11-10 08:55:14 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-11-10 08:55:14 +0800 |
| commit | 3a6160031b54c2e1174b1f990c7393ef8cb39d3d (patch) | |
| tree | 9410f60fd52d173303d6faf718f0fa3f579617e8 /http-backend.c | |
| parent | ed7fe7be5206f95ee556c363b396d5bb400d32d0 (diff) | |
| parent | 6c220937e2b26d85920bf2d38ff2464a0d57fd6b (diff) | |
| download | git-3a6160031b54c2e1174b1f990c7393ef8cb39d3d.tar.gz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
Git 2.34-rc2
parse-options.[ch]: revert use of "enum" for parse_options()
t/lib-git.sh: fix ACL-related permissions failure
A few fixes before -rc2
async_die_is_recursing: work around GCC v11.x issue on Fedora
Document positive variant of commit and merge option "--no-verify"
pull: honor --no-verify and do not call the commit-msg hook
http-backend: remove a duplicated code branch
Diffstat (limited to 'http-backend.c')
| -rw-r--r-- | http-backend.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/http-backend.c b/http-backend.c index e7c0eeab23..3d6e2ff17f 100644 --- a/http-backend.c +++ b/http-backend.c @@ -466,9 +466,7 @@ static void run_service(const char **argv, int buffer_input) struct child_process cld = CHILD_PROCESS_INIT; ssize_t req_len = get_content_length(); - if (encoding && !strcmp(encoding, "gzip")) - gzipped_request = 1; - else if (encoding && !strcmp(encoding, "x-gzip")) + if (encoding && (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip"))) gzipped_request = 1; if (!user || !*user) |