summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:10:28 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:10:28 -0800
commitc4c9a63b5434d008fdbfc8c41240d642cbe5147e (patch)
treef97260b025406b972b33250efbd6d4a95e6ab412 /http.h
parent62cdb6b23a7c6cf527d8f8c470c7d463f6ca9f6d (diff)
parent093c44a3600323c3ca7a8d28a0d2ba2bc145dd47 (diff)
downloadgit-c4c9a63b5434d008fdbfc8c41240d642cbe5147e.tar.gz
Merge branch 'mf/curl-select-fdset'
* mf/curl-select-fdset: http: drop "local" member from request struct http.c: Rely on select instead of tracking whether data was received http.c: Use timeout suggested by curl instead of fixed 50ms timeout http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
Diffstat (limited to 'http.h')
-rw-r--r--http.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/http.h b/http.h
index 3c332a98e9..ee1606942a 100644
--- a/http.h
+++ b/http.h
@@ -49,7 +49,6 @@ struct slot_results {
struct active_request_slot {
CURL *curl;
- FILE *local;
int in_use;
CURLcode curl_result;
long http_code;
@@ -89,7 +88,6 @@ extern void step_active_slots(void);
extern void http_init(struct remote *remote, const char *url);
extern void http_cleanup(void);
-extern int data_received;
extern int active_requests;
extern int http_is_verbose;
extern size_t http_post_buffer;