Merge branch 'jk/upload-pack-keepalive'
commit7b8315bb593c38ac957486916512e9a5df6df087
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:39:05 +0000 (20 12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:39:05 +0000 (20 12:39 -0700)
tree626821ff6571b15d40f08fb13a6efb3c9f362c18
parentf406140baa5128bfa537c271c7292a866c08b7d4
parent115dedd72223e101181363f4e6053b4c937fdc37
Merge branch 'jk/upload-pack-keepalive'

When running "fetch -q", a long silence while the sender side
computes the set of objects to send can be mistaken by proxies as
dropped connection.  The server side has been taught to send a small
empty messages to keep the connection alive.

* jk/upload-pack-keepalive:
  upload-pack: bump keepalive default to 5 seconds
  upload-pack: send keepalive packets during pack computation
Documentation/config.txt
upload-pack.c