diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-10-16 11:44:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-16 11:44:37 -0700 |
commit | 053a08f5bba3444d40516baf30a5d61e42e4fb93 (patch) | |
tree | 669afbf17fee7188525b8d01f7e339d3f7101904 /http.h | |
parent | l10n: Update git.pot (3 new, 6 removed messages) (diff) | |
parent | http: fix segfault in handle_curl_result (diff) | |
download | tgif-053a08f5bba3444d40516baf30a5d61e42e4fb93.tar.xz |
Merge branch 'jk/maint-http-half-auth-push'
Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).
* jk/maint-http-half-auth-push:
http: fix segfault in handle_curl_result
Diffstat (limited to 'http.h')
-rw-r--r-- | http.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -78,7 +78,8 @@ extern int start_active_slot(struct active_request_slot *slot); extern void run_active_slot(struct active_request_slot *slot); extern void finish_active_slot(struct active_request_slot *slot); extern void finish_all_active_slots(void); -extern int handle_curl_result(struct active_request_slot *slot); +extern int handle_curl_result(struct active_request_slot *slot, + struct slot_results *results); #ifdef USE_CURL_MULTI extern void fill_active_slots(void); |