upload-pack: bump keepalive default to 5 seconds

There is no reason not to turn on keepalives by default.
They take very little bandwidth, and significantly less than
the progress reporting they are replacing. And in the case
that progress reporting is on, we should never need to send
a keepalive anyway, as we will constantly be showing
progress and resetting the keepalive timer.

We do not necessarily know what the client's idea of a
reasonable timeout is, so let's keep this on the low side of
5 seconds. That is high enough that we will always prefer
our normal 1-second progress reports to sending a keepalive
packet, but low enough that no sane client should consider
the connection hung.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 432c38c3f2942c919063c6d06aec572351e170b0..3fc08293b7ccf8eb91a58030df115fb0544ab61f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2173,7 +2173,7 @@ uploadpack.keepalive::
        the server to be hung and give up. Setting this option instructs
        `upload-pack` to send an empty keepalive packet every
        `uploadpack.keepalive` seconds. Setting this option to 0
        the server to be hung and give up. Setting this option instructs
        `upload-pack` to send an empty keepalive packet every
        `uploadpack.keepalive` seconds. Setting this option to 0

-       disables keepalive packets entirely. The default is 0.
+       disables keepalive packets entirely. The default is 5 seconds.

 
 url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to
 
 url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to

diff --git a/upload-pack.c b/upload-pack.c
index 289717ed5f239f28bf5c2dc10155e866ff56cb2d..fb9be2a93767904a312f50b5403bc7d7441482e8 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -40,7 +40,7 @@ static struct object_array have_obj;
 static struct object_array want_obj;
 static struct object_array extra_edge_obj;
 static unsigned int timeout;
 static struct object_array want_obj;
 static struct object_array extra_edge_obj;
 static unsigned int timeout;

-static int keepalive = -1;
+static int keepalive = 5;

 /* 0 for no sideband,
  * otherwise maximum packet size (up to 65520 bytes).
  */
 /* 0 for no sideband,
  * otherwise maximum packet size (up to 65520 bytes).
  */