From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:03:17 +0000 (-0800)
Subject: Merge branch 'mf/curl-select-fdset' into maint
X-Git-Tag: v1.7.8.1~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc545433bdab7ec17e6609d2249771d407370a4d;p=git.git

Merge branch 'mf/curl-select-fdset' into maint

* 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
---

fc545433bdab7ec17e6609d2249771d407370a4d
diff --cc http.h
index 3c332a98e,368bc0e80..ee1606942
--- a/http.h
+++ b/http.h
@@@ -86,10 -85,9 +85,9 @@@ extern void add_fill_function(void *dat
  extern void step_active_slots(void);
  #endif
  
 -extern void http_init(struct remote *remote);
 +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;