diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-10 20:35:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-10 20:35:23 -0800 |
| commit | 271cd23527c851ec5dd31a8603a8b25f936eb9e1 (patch) | |
| tree | 9a90a3545a77c50ce8d58c10ce4f203b227f225f /http-push.c | |
| parent | b3310b5e2f576ef807f90eab0e6e178b65bbfb55 (diff) | |
| parent | 3443db51a0f2a43061d4badc6a0065672386eae5 (diff) | |
| download | git-271cd23527c851ec5dd31a8603a8b25f936eb9e1.tar.gz | |
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
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/http-push.c b/http-push.c index 9923441a4e..3e72e84e84 100644 --- a/http-push.c +++ b/http-push.c @@ -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); |