Merge branch 'sp/smart-http-content-type-check'

The smart HTTP clients forgot to verify the content-type that comes
back from the server side to make sure that the request is being
handled properly.

* sp/smart-http-content-type-check:
  http_request: reset "type" strbuf before adding
  t5551: fix expected error output
  Verify Content-Type from smart HTTP servers
This commit is contained in:
Junio C Hamano
2013-02-10 20:35:23 -08:00
8 changed files with 59 additions and 17 deletions

View File

@ -1539,7 +1539,7 @@ static int remote_exists(const char *path)
sprintf(url, "%s%s", repo->url, path);
switch (http_get_strbuf(url, NULL, 0)) {
switch (http_get_strbuf(url, NULL, NULL, 0)) {
case HTTP_OK:
ret = 1;
break;
@ -1563,7 +1563,7 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
url = xmalloc(strlen(repo->url) + strlen(path) + 1);
sprintf(url, "%s%s", repo->url, path);
if (http_get_strbuf(url, &buffer, 0) != HTTP_OK)
if (http_get_strbuf(url, NULL, &buffer, 0) != HTTP_OK)
die("Couldn't get %s for remote symref\n%s", url,
curl_errorstr);
free(url);