diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:29:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-10 10:35:42 -0700 |
| commit | fe468efff533c3c92c174ae4706532c1521c150c (patch) | |
| tree | c5ffc1d319f4c13843c6ed398d9f12724cfcd072 | |
| parent | Git 2.19-rc2 (diff) | |
| parent | http-backend: allow empty CONTENT_LENGTH (diff) | |
| download | tgif-fe468efff533c3c92c174ae4706532c1521c150c.tar.xz | |
Merge branch 'mk/http-backend-content-length'
The earlier attempt barfed when given a CONTENT_LENGTH that is
set to an empty string. RFC 3875 is fairly clear that in this
case we should not read any message body, but we've been reading
through to the EOF in previous versions (which did not even pay
attention to the environment variable), so keep that behaviour for
now in this late update.
* mk/http-backend-content-length:
http-backend: allow empty CONTENT_LENGTH
| -rw-r--r-- | http-backend.c | 2 | ||||
| -rwxr-xr-x | t/t5562-http-backend-content-length.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/http-backend.c b/http-backend.c index 88c38c834b..458642ef72 100644 --- a/http-backend.c +++ b/http-backend.c @@ -353,7 +353,7 @@ static ssize_t get_content_length(void) ssize_t val = -1; const char *str = getenv("CONTENT_LENGTH"); - if (str && !git_parse_ssize_t(str, &val)) + if (str && *str && !git_parse_ssize_t(str, &val)) die("failed to parse CONTENT_LENGTH: %s", str); return val; } diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh index 43570ce120..f94d01f69e 100755 --- a/t/t5562-http-backend-content-length.sh +++ b/t/t5562-http-backend-content-length.sh @@ -153,4 +153,15 @@ test_expect_success 'CONTENT_LENGTH overflow ssite_t' ' grep "fatal:.*CONTENT_LENGTH" err ' +test_expect_success 'empty CONTENT_LENGTH' ' + env \ + QUERY_STRING=/repo.git/HEAD \ + PATH_TRANSLATED="$PWD"/.git/HEAD \ + GIT_HTTP_EXPORT_ALL=TRUE \ + REQUEST_METHOD=GET \ + CONTENT_LENGTH="" \ + git http-backend <empty_body >act.out 2>act.err && + verify_http_result "200 OK" +' + test_done |