http-backend: allow empty CONTENT_LENGTH
According to RFC3875, empty environment variable is equivalent to unset, and for CONTENT_LENGTH it should mean zero body to read. However, unset CONTENT_LENGTH is also used for chunked encoding to indicate reading until EOF. At least, the test "large fetch-pack requests can be split across POSTs" from t5551 starts faliing, if unset or empty CONTENT_LENGTH is treated as zero length body. So keep the existing behavior as much as possible. Add a test for the case. Reported-By: Jelmer Vernooij <jelmer@jelmer.uk> Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
eebfe40962
commit
574c513e8d
@ -353,7 +353,7 @@ static ssize_t get_content_length(void)
|
|||||||
ssize_t val = -1;
|
ssize_t val = -1;
|
||||||
const char *str = getenv("CONTENT_LENGTH");
|
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);
|
die("failed to parse CONTENT_LENGTH: %s", str);
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
@ -153,4 +153,15 @@ test_expect_success 'CONTENT_LENGTH overflow ssite_t' '
|
|||||||
grep "fatal:.*CONTENT_LENGTH" err
|
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
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user