From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Jan 2017 23:24:25 +0000 (-0800)
Subject: Merge branch 'dt/smart-http-detect-server-going-away'
X-Git-Tag: v2.12.0-rc0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d984592043aec3c9f5b1955560a133896ca115b5;p=thirdparty%2Fgit.git

Merge branch 'dt/smart-http-detect-server-going-away'

When the http server gives an incomplete response to a smart-http
rpc call, it could lead to client waiting for a full response that
will never come.  Teach the client side to notice this condition
and abort the transfer.

An improvement counterproposal has failed.
cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>

* dt/smart-http-detect-server-going-away:
  upload-pack: optionally allow fetching any sha1
  remote-curl: don't hang when a server dies before any output
---

d984592043aec3c9f5b1955560a133896ca115b5
diff --cc Documentation/config.txt
index 4a991f3582,b7f9991cc7..1abf078c4e
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -3025,11 -2959,13 +3025,16 @@@ uploadpack.allowReachableSHA1InWant:
  	Allow `upload-pack` to accept a fetch request that asks for an
  	object that is reachable from any ref tip. However, note that
  	calculating object reachability is computationally expensive.
 -	Defaults to `false`.
 +	Defaults to `false`.  Even if this is false, a client may be able
 +	to steal objects via the techniques described in the "SECURITY"
 +	section of the linkgit:gitnamespaces[7] man page; it's best to
 +	keep private data in a separate repository.
  
+ uploadpack.allowAnySHA1InWant::
+ 	Allow `upload-pack` to accept a fetch request that asks for any
+ 	object at all.
+ 	Defaults to `false`.
+ 
  uploadpack.keepAlive::
  	When `upload-pack` has started `pack-objects`, there may be a
  	quiet period while `pack-objects` prepares the pack. Normally