Re: [PATCH] http: fix charset detection of extract_content_type()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



nori <semtlenori@xxxxxxxxx> writes:

> 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@xxxxxxxxxxxxx>
> ---

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?

>  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;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]