Merge branch 'jk/http-errors'

Propagate the error messages from the webserver better to the
client coming over the HTTP transport.

* jk/http-errors:
  http: default text charset to iso-8859-1
  remote-curl: reencode http error messages
  strbuf: add strbuf_reencode helper
  http: optionally extract charset parameter from content-type
  http: extract type/subtype portion of content-type
  t5550: test display of remote http error messages
  t/lib-httpd: use write_script to copy CGI scripts
  test-lib: preserve GIT_CURL_VERBOSE from the environment

diff --cc Documentation/technical/api-strbuf.txt
index 50690186d3949de7168e579b0f7a54d6cb0dd8e5,9d28b034ad9a35108f8069557e194992f8e36b0f..077a7096a4ba3c47a0cbc8981abdde1b7b35d924
--- 1/Documentation/technical/api-strbuf.txt
--- 2/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@@ -130,14 -125,11 +130,19 @@@ Function
  
        Strip whitespace from the end of a string.
  
 +`strbuf_ltrim`::
 +
 +      Strip whitespace from the beginning of a string.
 +
+ `strbuf_reencode`::
+ 
+       Replace the contents of the strbuf with a reencoded form.  Returns -1
+       on error, 0 on success.
+ 
 +`strbuf_tolower`::
 +
 +      Lowercase each character in the buffer using `tolower`.
 +
  `strbuf_cmp`::
  
        Compare two buffers. Returns an integer less than, equal to, or greater

diff --cc strbuf.c
index c8217755e541f05281d10e07517602f0fdcbde42,fc7290f57a07353ab7bbf86b7c743ec913ee396c..ac62982e672c22457468f601b35716dc9a52a81c
--- 1/strbuf.c
--- 2/strbuf.c
+++ b/strbuf.c
@@@ -99,13 -107,22 +100,29 @@@ void strbuf_ltrim(struct strbuf *sb
        sb->buf[sb->len] = '\0';
  }
  
+ int strbuf_reencode(struct strbuf *sb, const char *from, const char *to)
+ {
+       char *out;
+       int len;
+ 
+       if (same_encoding(from, to))
+               return 0;
+ 
+       out = reencode_string_len(sb->buf, sb->len, to, from, &len);
+       if (!out)
+               return -1;
+ 
+       strbuf_attach(sb, out, len, len);
+       return 0;
+ }
+ 
 +void strbuf_tolower(struct strbuf *sb)
 +{
 +      char *p = sb->buf, *end = sb->buf + sb->len;
 +      for (; p < end; p++)
 +              *p = tolower(*p);
 +}
 +
  struct strbuf **strbuf_split_buf(const char *str, size_t slen,
                                 int terminator, int max)
  {

diff --cc strbuf.h
index 25328b9e8193e9f56431450b6125d6ce7d667d91,4e9a2f88686e211b8610d72e18c02251c2dc8a92..e9ad03eabe72dc2ee6e7e0086baca71d343264ce
--- 1/strbuf.h
--- 2/strbuf.h
+++ b/strbuf.h
@@@ -45,7 -45,7 +45,8 @@@ static inline void strbuf_setlen(struc
  extern void strbuf_trim(struct strbuf *);
  extern void strbuf_rtrim(struct strbuf *);
  extern void strbuf_ltrim(struct strbuf *);
+ extern int strbuf_reencode(struct strbuf *sb, const char *from, const char *to);
 +extern void strbuf_tolower(struct strbuf *sb);
  extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);
  
  /*

diff --cc t/lib-httpd.sh
Simple merge