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>

diff --git a/http-backend.c b/http-backend.c
index e88d29f62b1f1f426b1ca75aafc126da96a8a1da..a1230d7ead1a6a3c49c99a809b529a3a2b419043 100644 (file)
--- 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");
 
        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;
 }
                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 43570ce12004d4fd95c85276cdac8f52627c73d9..f94d01f69e5cb9565540411de2c09df92262b9c3 100755 (executable)
--- 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
 '
 
        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