Re: [PATCH] http-backend: allow empty CONTENT_LENGTH
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 6, 2018, 21:54 UTC
- Message-ID
- <xmqq1sa6z3zp.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180906193516.28909-1-max@max630.net>
Max Kirillov <max@max630.net> writes:
Show 6 quoted lines
> According to RFC3875, empty environment variable is equivalent to unset, > and for CONTENT_LENGTH it should mean zero body to read. > > However, as discussed in [1], unset CONTENT_LENGTH is also used for > chunked encoding to indicate reading until EOF, so keep this behavior also > for empty CONTENT_LENGTH.
Makes sense.
Show 12 quoted lines
> > Add a test for the case. > > [1] https://public-inbox.org/git/20160329201349.GB9527@sigill.intra.peff.net/ > > Signed-off-by: Max Kirillov <max@max630.net> > --- > Hi. > > This should fix it. I'm not sure should it treat it as 0 or "-1" > At least the tests mentioned by Jeff fails if I try to treat missing CONTENT_LENGTH as "-1" > So keep the existing behavior as much as possible
I am not sure what you mean by the above, between 0 and -1. The code signals the caller of get_content_length() that req_len is -1 which is used as a sign to read through to the EOF, so it appears to me that the code treats missing content-length (i.e. str == NULL case) as "-1".
Show 37 quoted lines
> http-backend.c | 2 +-
> t/t5562-http-backend-content-length.sh | 11 +++++++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/http-backend.c b/http-backend.c
> index e88d29f62b..a1230d7ead 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 057dcb85d6..ca34c2f054 100755
> --- a/t/t5562-http-backend-content-length.sh
> +++ b/t/t5562-http-backend-content-length.sh
> @@ -152,4 +152,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