From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 00:06:32 +0000 (-0800)
Subject: Merge branch 'ew/keepalive'
X-Git-Tag: v1.7.9-rc0~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85878dd0c929dde5d91411b57ef9f2d696cbc7d8;p=git.git

Merge branch 'ew/keepalive'

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

85878dd0c929dde5d91411b57ef9f2d696cbc7d8
diff --cc connect.c
index 2a0a0401a,d725b1794..c8d0ea5d7
--- a/connect.c
+++ b/connect.c
@@@ -286,8 -324,10 +297,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");