From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:32:36 +0000 (-0800)
Subject: Merge branch 'ew/keepalive' into maint
X-Git-Tag: v1.7.8.2~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2cb1ff9ac35ff043e377f78e36a57422a6846485;p=git.git

Merge branch 'ew/keepalive' into maint

* ew/keepalive:
  enable SO_KEEPALIVE for connected TCP sockets
---

2cb1ff9ac35ff043e377f78e36a57422a6846485
diff --cc connect.c
index 51990fa0c,d725b1794..d0f59ef0d
--- a/connect.c
+++ b/connect.c
@@@ -310,8 -324,10 +321,10 @@@ static int git_tcp_connect_sock(char *h
  	}
  
  	if (sockfd < 0)
 -		die("unable to connect a socket (%s)", strerror(saved_errno));
 +		die("unable to connect to %s:\n%s", host, error_message.buf);
  
+ 	enable_keepalive(sockfd);
+ 
  	if (flags & CONNECT_VERBOSE)
  		fprintf(stderr, "done.\n");