diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:42:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:42:08 -0700 |
| commit | 80292f210499012525dbb42185b448e35f0ed564 (patch) | |
| tree | a422287517a1e940f090978df4feba85887a8a95 /http.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | http: set curl FAILONERROR each time we select a handle (diff) | |
| download | tgif-80292f210499012525dbb42185b448e35f0ed564.tar.xz | |
Merge branch 'jk/http-error-messages'
A regression fix for the recently graduated topic.
* jk/http-error-messages:
http: set curl FAILONERROR each time we select a handle
Diffstat (limited to 'http.c')
| -rw-r--r-- | http.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -282,7 +282,6 @@ static CURL *get_curl_handle(void) #endif if (ssl_cainfo != NULL) curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo); - curl_easy_setopt(result, CURLOPT_FAILONERROR, 1); if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) { curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT, @@ -506,6 +505,7 @@ struct active_request_slot *get_active_slot(void) curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, NULL); curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0); curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); + curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1); if (http_auth.password) init_curl_http_auth(slot->curl); |