delta/git.git, branch jk/http-errors

http: default text charset to iso-8859-1

2014-05-27T16:59:22+00:00

This is specified by RFC 2616 as the default if no "charset"
parameter is given.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

remote-curl: reencode http error messages

2014-05-27T16:59:22+00:00

We currently recognize an error message with a content-type
"text/plain; charset=utf-16" as text, but we ignore the
charset parameter entirely. Let's encode it to
log_output_encoding, which is presumably something the
user's terminal can handle.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

strbuf: add strbuf_reencode helper

2014-05-27T16:59:21+00:00

This is a convenience wrapper around `reencode_string_len`
and `strbuf_attach`.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

http: optionally extract charset parameter from content-type

2014-05-27T16:59:19+00:00

Since the previous commit, we now give a sanitized,
shortened version of the content-type header to any callers
who ask for it.

This patch adds back a way for them to cleanly access
specific parameters to the type. We could easily extract all
parameters and make them available via a string_list, but:

  1. That complicates the interface and memory management.

  2. In practice, no planned callers care about anything
     except the charset.

This patch therefore goes with the simplest thing, and we
can expand or change the interface later if it becomes
necessary.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

http: extract type/subtype portion of content-type

2014-05-27T16:57:00+00:00

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 
Signed-off-by: Junio C Hamano

t5550: test display of remote http error messages

2014-05-23T19:43:51+00:00

Since commit 426e70d (remote-curl: show server content on
http errors, 2013-04-05), we relay any text/plain error
messages from the remote server to the user. However, we
never tested it.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

t/lib-httpd: use write_script to copy CGI scripts

2014-05-23T19:41:50+00:00

Using write_script will set our shebang line appropriately
with $SHELL_PATH. The script that is there now is quite
simple and likely to succeed even with a non-POSIX /bin/sh,
but it does not hurt to be defensive.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

test-lib: preserve GIT_CURL_VERBOSE from the environment

2014-05-23T19:41:48+00:00

Turning on this variable can be useful when debugging http
tests. It does break a few tests in t5541, but it is not
a variable that the user is likely to have enabled
accidentally.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Update draft release notes to 2.0

2014-05-21T18:50:35+00:00

Hopefully for the last time ;-)

Signed-off-by: Junio C Hamano

Git 2.0-rc4

2014-05-20T21:51:11+00:00

Signed-off-by: Junio C Hamano