Re: [PATCH] http: fix charset detection of extract_content_type()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 16, 2014, 18:29 UTC
- Message-ID
- <xmqqha3kr9m4.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <539caff7.e7bc420a.76b9.fffff853@mx.google.com>
nori <semtlenori@gmail.com> writes:
Show 8 quoted lines
> extract_content_type() could not extract a charset parameter if the > parameter is not the first one and there is a whitespace and a following > semicolon just before the parameter. For example: > > text/plain; format=fixed ;charset=utf-8 > > Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com> > ---
Peff, doesn't this look somehow familiar? Perhaps with e3131626 (http: optionally extract charset parameter from content-type, 2014-05-22), this patch is unnecessary?
Show 16 quoted lines
> http.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/http.c b/http.c
> index 2b4f6a3..05e8b91 100644
> --- a/http.c
> +++ b/http.c
> @@ -971,7 +971,7 @@ static void extract_content_type(struct strbuf *raw, struct strbuf *type,
>
> strbuf_reset(charset);
> while (*p) {
> - while (isspace(*p))
> + while (isspace(*p) || *p == ';')
> p++;
> if (!extract_param(p, "charset", charset))
> return;