Re: [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 27, 2017, 04:02 UTC
- Message-ID
- <xmqqzi78e5dp.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20171126193813.12531-1-max@max630.net>
To recap (other than the typofix in the proposed log message), here is what I would have as SQUASH??? on top of (or interspersed with) v6.
Thanks.
diff --git a/http-backend.c b/http-backend.c index 69570d16e7..2268d65731 100644 --- a/http-backend.c +++ b/http-backend.c @@ -324,10 +324,9 @@ static ssize_t read_request_fixed_len(int fd, ssize_t req_len, unsigned char **o ssize_t cnt = 0; if (max_request_buffer < req_len) { - die("request was larger than our maximum size (%lu): %lu;" - " try setting GIT_HTTP_MAX_REQUEST_BUFFER", - max_request_buffer, - req_len); + die("request was larger than our maximum size (%lu): " + "%" PRIuMAX "; try setting GIT_HTTP_MAX_REQUEST_BUFFER", + max_request_buffer, (uintmax_t)req_len); } if (req_len <= 0) { diff --git a/Makefile b/Makefile index e61f8319b3..3380f68040 100644 --- a/Makefile +++ b/Makefile @@ -661,7 +661,7 @@ TEST_PROGRAMS_NEED_X += test-mktemp TEST_PROGRAMS_NEED_X += test-online-cpus TEST_PROGRAMS_NEED_X += test-parse-options TEST_PROGRAMS_NEED_X += test-path-utils -TEST_PROGRAMS_NEED_X += test-print-values +TEST_PROGRAMS_NEED_X += test-print-larger-than-ssize TEST_PROGRAMS_NEED_X += test-prio-queue TEST_PROGRAMS_NEED_X += test-read-cache TEST_PROGRAMS_NEED_X += test-write-cache diff --git a/t/helper/test-print-values.c b/t/helper/test-print-larger-than-ssize.c similarity index 31% rename from t/helper/test-print-values.c rename to t/helper/test-print-larger-than-ssize.c index 8f7e5af319..b9852c493d 100644 --- a/t/helper/test-print-values.c +++ b/t/helper/test-print-larger-than-ssize.c @@ -1,10 +1,10 @@ -#include <stdio.h> -#include <string.h> +#include "cache.h" int cmd_main(int argc, const char **argv) { - if (argc == 2 && strcmp(argv[1], "(size_t)(-20)") == 0) - printf("%zu", (ssize_t)(-20)); + size_t large = ~0; + large = ~(large & ~(large >> 1)) + 1; + printf("%" PRIuMAX "\n", (uintmax_t) large); return 0; } diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index f452090216..112b5d6eb2 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -72,7 +72,7 @@ test_expect_success 'http-backend blocks bad PATH_INFO' ' ' # overrides existing definition for further cases -run_backend() { +run_backend () { CONTENT_LENGTH="${#2}" && export CONTENT_LENGTH && ( echo "$2" && cat /dev/zero ) | QUERY_STRING="${1#*[?]}" \ @@ -89,7 +89,7 @@ test_expect_success 'CONTENT_LENGTH set and infinite input' ' ' test_expect_success 'CONTENT_LENGTH overflow ssite_t' ' - NOT_FIT_IN_SSIZE=`"$GIT_BUILD_DIR/t/helper/test-print-values" "(size_t)(-20)"` && + NOT_FIT_IN_SSIZE=$("$GIT_BUILD_DIR/t/helper/test-print-larger-than-ssize") && env \ CONTENT_TYPE=application/x-git-upload-pack-request \ QUERY_STRING=/repo.git/git-upload-pack \