Merge branch 'nl/http-proxy-more' into next
commitc004001ab685146d707f400d58e5ec02af89fc2f
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:59 +0000 (20 15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:59 +0000 (20 15:54 -0700)
tree74185d86bd285899f697d0304e63a2c8405eb62d
parent3092a2b4cefac75611c80cc5f268b5fc33dd472f
parent72d62efe1c6044b25e2e3bdabde3eba2de75db48
Merge branch 'nl/http-proxy-more' into next

The code to talk to http proxies learn to use the same credential
API used to talk to the final http destinations.

Will defer til 1.7.10.

* nl/http-proxy-more:
  http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
  http: Avoid limit of retrying request only twice
  http: handle proxy authentication failure (error 407)
  http: handle proxy proactive authentication
  http: try http_proxy env var when http.proxy config option is not set