diff options
| author | Jeff King <peff@peff.net> | 2014-05-22 05:29:47 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-27 09:57:00 -0700 |
| commit | bf197fd7eebcb3579dd659af35822ce88adc66c8 (patch) | |
| tree | 746ca7087ca1a5e48a30a20262e831ce2f83c426 /remote-curl.c | |
| parent | dbcf2bd3dec1244fdbafb3ec7312ed14d83c0025 (diff) | |
| download | git-bf197fd7eebcb3579dd659af35822ce88adc66c8.tar.gz | |
http: extract type/subtype portion of content-type
When we get a content-type from curl, we get the whole
header line, including any parameters, and without any
normalization (like downcasing or whitespace) applied.
If we later try to match it with strcmp() or even
strcasecmp(), we may get false negatives.
This could cause two visible behaviors:
1. We might fail to recognize a smart-http server by its
content-type.
2. We might fail to relay text/plain error messages to
users (especially if they contain a charset parameter).
This patch teaches the http code to extract and normalize
just the type/subtype portion of the string. This is
technically passing out less information to the callers, who
can no longer see the parameters. But none of the current
callers cares, and a future patch will add back an
easier-to-use method for accessing those parameters.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remote-curl.c b/remote-curl.c index 52c2d96ce6..a5ab977306 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -205,7 +205,7 @@ static int show_http_message(struct strbuf *type, struct strbuf *msg) * TODO should handle "; charset=XXX", and re-encode into * logoutputencoding */ - if (strcasecmp(type->buf, "text/plain")) + if (strcmp(type->buf, "text/plain")) return -1; strbuf_trim(msg); |