From: Max Kirillov <max@max630.net> To: Jonathan Nieder <jrnieder@gmail.com> Cc: "Max Kirillov" <max@max630.net>, "Jelmer Vernooij" <jelmer@jelmer.uk>, git@vger.kernel.org, "Jeff King" <peff@peff.net> Subject: [PATCH v2] http-backend: allow empty CONTENT_LENGTH Date: Fri, 7 Sep 2018 06:36:07 +0300 Message-ID: <20180907033607.24604-1-max@max630.net> (raw) In-Reply-To: <20180906193516.28909-1-max@max630.net> 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> --- Added the "reported-by" and explained inline the reason to keep existing behavior 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 -- 2.17.0.1185.g782057d875
next prev parent reply index Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-06 6:10 CONTENT_LENGTH can no longer be empty Jonathan Nieder 2018-09-06 19:35 ` [PATCH] http-backend: allow empty CONTENT_LENGTH Max Kirillov 2018-09-06 21:54 ` Junio C Hamano 2018-09-07 3:27 ` Max Kirillov 2018-09-07 3:38 ` Jeff King 2018-09-07 4:20 ` Max Kirillov 2018-09-07 4:59 ` Max Kirillov 2018-09-07 9:49 ` Junio C Hamano 2018-09-08 5:41 ` Max Kirillov 2018-09-09 4:40 ` Max Kirillov 2018-09-06 22:45 ` Jonathan Nieder 2018-09-07 3:36 ` Max Kirillov [this message] 2018-09-08 0:19 ` [PATCH v2] " Jonathan Nieder 2018-09-08 5:35 ` Max Kirillov 2018-09-08 5:42 ` [PATCH v3] " Max Kirillov 2018-09-10 5:17 ` Jonathan Nieder 2018-09-10 20:36 ` Max Kirillov 2018-09-09 4:10 ` [PATCH v4] " Max Kirillov 2018-09-10 5:25 ` Jonathan Nieder 2018-09-10 13:17 ` Jeff King 2018-09-10 16:37 ` Junio C Hamano 2018-09-10 18:46 ` Jeff King 2018-09-10 20:53 ` [PATCH] http-backend: Treat empty CONTENT_LENGTH as zero Max Kirillov 2018-09-10 21:22 ` Jonathan Nieder 2018-09-11 1:55 ` Jeff King 2018-09-11 2:20 ` Jonathan Nieder 2018-09-11 2:30 ` Jeff King 2018-09-11 1:58 ` Jeff King 2018-09-11 3:42 ` [PATCH] http-backend: treat " Jonathan Nieder 2018-09-11 4:03 ` Jonathan Nieder 2018-09-11 18:15 ` Junio C Hamano 2018-09-11 18:27 ` Junio C Hamano 2018-09-12 5:56 ` Jeff King 2018-09-12 6:26 ` Jonathan Nieder 2018-09-12 16:10 ` Junio C Hamano 2018-09-11 4:18 ` Junio C Hamano 2018-09-11 4:29 ` Jonathan Nieder 2018-09-11 4:06 [PATCH v3] http-backend: allow empty CONTENT_LENGTH Jonathan Nieder 2018-09-11 20:33 ` [PATCH v2] http-backend test: make empty CONTENT_LENGTH test more realistic Max Kirillov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180907033607.24604-1-max@max630.net \ --to=max@max630.net \ --cc=git@vger.kernel.org \ --cc=jelmer@jelmer.uk \ --cc=jrnieder@gmail.com \ --cc=peff@peff.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Mailing List Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/git/0 git/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 git git/ https://lore.kernel.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git