From: Junio C Hamano <gitster@pobox.com>
To: Max Kirillov <max@max630.net>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Jeff King <peff@peff.net>,
Florian Manschwetus <manschwetus@cs-software-gmbh.de>,
Chris Packham <judge.packham@gmail.com>,
Konstantin Khomoutov <kostix+git@007spb.ru>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875
Date: Mon, 27 Nov 2017 13:02:10 +0900 [thread overview]
Message-ID: <xmqqzi78e5dp.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171126193813.12531-1-max@max630.net> (Max Kirillov's message of "Sun, 26 Nov 2017 21:38:11 +0200")
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 \
next prev parent reply other threads:[~2017-11-27 4:02 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 10:38 [PATCH] Fix http-backend reading till EOF, ignoring CONTENT_LENGTH, violating rfc3875 -- WAS: Problem with git-http-backend.exe as iis cgi Florian Manschwetus
2016-03-29 20:13 ` Jeff King
2016-03-30 9:08 ` AW: " Florian Manschwetus
2016-04-01 23:55 ` Jeff King
2017-11-23 23:45 ` [PATCH] http-backend: respect CONTENT_LENGTH as specified by rfc3875 Max Kirillov
2017-11-24 1:30 ` Eric Sunshine
2017-11-25 21:47 ` Max Kirillov
2017-11-26 0:38 ` Eric Sunshine
2017-11-26 0:43 ` Max Kirillov
2017-11-24 5:54 ` Junio C Hamano
2017-11-24 8:30 ` AW: " Florian Manschwetus
2017-11-26 1:50 ` Max Kirillov
2017-11-26 1:47 ` [PATCH v4 0/2] " Max Kirillov
2017-11-26 1:47 ` [PATCH v4 1/2] " Max Kirillov
2017-11-26 1:47 ` [PATCH v4 2/2] t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases Max Kirillov
2017-11-26 1:54 ` [PATCH v5 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875 Max Kirillov
2017-11-26 1:54 ` [PATCH v5 1/2] " Max Kirillov
2017-11-26 3:46 ` Junio C Hamano
2017-11-26 8:13 ` Max Kirillov
2017-11-26 9:38 ` Junio C Hamano
2017-11-26 19:39 ` Max Kirillov
2017-11-26 1:54 ` [PATCH v5 2/2] t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases Max Kirillov
2017-11-26 19:38 ` [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875 Max Kirillov
2017-11-26 19:38 ` [PATCH v6 1/2] " Max Kirillov
2017-11-26 22:08 ` Eric Sunshine
2017-11-29 3:22 ` Jeff King
2017-12-03 1:02 ` Junio C Hamano
2017-12-03 2:49 ` Jeff King
2017-12-03 6:07 ` Junio C Hamano
2017-12-04 7:18 ` AW: " Florian Manschwetus
2017-12-04 17:13 ` Jeff King
2017-11-26 19:38 ` [PATCH v6 2/2] t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases Max Kirillov
2017-11-26 22:18 ` Eric Sunshine
2017-11-26 22:40 ` Max Kirillov
2017-11-29 3:26 ` Jeff King
2017-11-29 5:19 ` Max Kirillov
2017-12-03 0:46 ` Junio C Hamano
2017-11-27 0:29 ` Junio C Hamano
2017-11-27 4:02 ` Junio C Hamano [this message]
2017-11-29 5:07 ` [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875 Max Kirillov
2017-12-03 0:48 ` Junio C Hamano
2017-12-12 16:17 ` Need to add test artifacts to .gitignore Dan Jacques
2017-12-12 19:00 ` [RFC PATCH] t/helper: Move sources to t/helper-src; gitignore any files in t/helper Stefan Beller
2017-12-12 19:59 ` Junio C Hamano
2017-12-12 20:56 ` [PATCH] t/helper: ignore everything but sources Stefan Beller
2017-12-12 21:06 ` Junio C Hamano
2017-12-13 20:12 ` Stefan Beller
2017-12-12 21:06 ` Todd Zullinger
2017-12-19 22:13 ` [PATCH v6 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875 Junio C Hamano
2017-12-20 4:30 ` 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=xmqqzi78e5dp.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=judge.packham@gmail.com \
--cc=kostix+git@007spb.ru \
--cc=manschwetus@cs-software-gmbh.de \
--cc=max@max630.net \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.