Merge branch 'ew/keepalive'
commitbb2fd90c7bbb4261aa1800a4c35b06dc5116a647
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:43:24 +0000 (28 10:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:43:24 +0000 (28 10:43 -0700)
tree74073fb08244782e90ebd71ba7e1ab6f4bdc8266
parent2d99baab2f054926a1b26f7854fc50b701151bd7
parent47ce115370cba8ebfced696f9997e718c465435d
Merge branch 'ew/keepalive'

* ew/keepalive:
  http: use curl's tcp keepalive if available
  http: enable keepalive on TCP sockets
http.c