From: Junio C Hamano <gitster@pobox•com>
To: "Li Linchao via GitGitGadget" <gitgitgadget@gmail•com>
Cc: git@vger•kernel.org, "Jonathan Tan" <jonathantanmy@google•com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx•de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Li Linchao" <lilinchao@oschina•cn>
Subject: Re: [PATCH v3] remote-curl: send Accept-Language header to server
Date: Mon, 13 Jun 2022 14:32:23 -0700 [thread overview]
Message-ID: <xmqq1qvs5jx4.fsf@gitster.g> (raw)
In-Reply-To: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com> (Li Linchao via GitGitGadget's message of "Sun, 12 Jun 2022 17:20:21 +0000")
"Li Linchao via GitGitGadget" <gitgitgadget@gmail•com> writes:
> @@ -932,6 +933,10 @@ static int post_rpc(struct rpc_state *rpc, int stateless_connect, int flush_rece
> headers = curl_slist_append(headers, needs_100_continue ?
> "Expect: 100-continue" : "Expect:");
>
> + /* Add Accept-Language header */
> + if (rpc->hdr_accept_language)
> + headers = curl_slist_append(headers, rpc->hdr_accept_language);
> +
> /* Add the extra Git-Protocol header */
> if (rpc->protocol_header)
> headers = curl_slist_append(headers, rpc->protocol_header);
> @@ -1080,6 +1085,8 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
> strbuf_addf(&buf, "%s%s", url.buf, svc);
> rpc->service_url = strbuf_detach(&buf, NULL);
>
> + rpc->hdr_accept_language = xstrdup_or_null(http_get_accept_language_header());
> +
> strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
> rpc->hdr_content_type = strbuf_detach(&buf, NULL);
>
> @@ -1118,6 +1125,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
> free(rpc->service_url);
> free(rpc->hdr_content_type);
> free(rpc->hdr_accept);
> + free(rpc->hdr_accept_language);
> free(rpc->protocol_header);
> free(rpc->buf);
> strbuf_release(&buf);
> @@ -1400,6 +1408,7 @@ static int stateless_connect(const char *service_name)
> struct discovery *discover;
> struct rpc_state rpc;
> struct strbuf buf = STRBUF_INIT;
> + const char *accept_language;
>
> /*
> * Run the info/refs request and see if the server supports protocol
> @@ -1418,6 +1427,9 @@ static int stateless_connect(const char *service_name)
> printf("\n");
> fflush(stdout);
> }
> + accept_language = http_get_accept_language_header();
> + if (accept_language)
> + rpc.hdr_accept_language = xstrfmt("%s", accept_language);
Isn't rpc.hdr_accept_language left uninitialized garbage if
accept_language is NULL? It is the same bug I pointed out earlier,
whose fix may have to be different.
Has this been tested? I got immediate segfault with this patch in
'seen'.
next prev parent reply other threads:[~2022-06-13 21:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 8:53 [PATCH] remote-curl: send Accept-Language header to server Li Linchao via GitGitGadget
2022-06-08 23:32 ` Junio C Hamano
2022-06-09 6:35 ` [PATCH v2] " Li Linchao via GitGitGadget
2022-06-09 23:55 ` Junio C Hamano
2022-06-10 3:49 ` lilinchao
2022-06-10 4:22 ` lilinchao
2022-06-12 17:20 ` [PATCH v3] " Li Linchao via GitGitGadget
2022-06-13 18:15 ` Junio C Hamano
2022-06-13 21:32 ` Junio C Hamano [this message]
2022-06-13 22:08 ` Junio C Hamano
2022-06-13 22:15 ` Junio C Hamano
2022-07-11 5:58 ` [PATCH v4] " Li Linchao via GitGitGadget
2022-06-09 7:30 ` [PATCH] " Ævar Arnfjörð Bjarmason
2022-06-09 17:34 ` Junio C Hamano
2022-06-10 2:38 ` lilinchao
2022-07-03 0:57 ` Junio C Hamano
2022-07-05 10:06 ` lilinchao
2022-07-05 10:15 ` Ævar Arnfjörð Bjarmason
2022-07-05 18:06 ` Junio C Hamano
2022-07-05 17:53 ` Junio C Hamano
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=xmqq1qvs5jx4.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=jonathantanmy@google$(echo .)com \
--cc=lilinchao@oschina$(echo .)cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox