git/http.c, branch v2.5.2

Merge branch 'et/http-proxyauth'

2015-07-13T21:00:24Z

We used to ask libCURL to use the most secure authentication method available when talking to an HTTP proxy only when we were told to talk to one via configuration variables. We now ask libCURL to always use the most secure authentication method, because the user can tell libCURL to use an HTTP proxy via an environment variable without using configuration variables. * et/http-proxyauth: http: always use any proxy auth method available

http: always use any proxy auth method available

2015-06-29T16:57:43Z

We set CURLOPT_PROXYAUTH to use the most secure authentication method available only when the user has set configuration variables to specify a proxy. However, libcurl also supports specifying a proxy through environment variables. In that case libcurl defaults to only using the Basic proxy authentication method, because we do not use CURLOPT_PROXYAUTH. Set CURLOPT_PROXYAUTH to always use the most secure authentication method available, even when there is no git configuration telling us to use a proxy. This allows the user to use environment variables to configure a proxy that requires an authentication method different from Basic. Signed-off-by: Enrique A. Tobis Signed-off-by: Junio C Hamano

Merge branch 'ls/http-ssl-cipher-list'

2015-05-22T19:41:45Z

Introduce http..SSLCipherList configuration variable to tweak the list of cipher suite to be used with libcURL when talking with https:// sites. * ls/http-ssl-cipher-list: http: add support for specifying an SSL cipher list

http: add support for specifying an SSL cipher list

2015-05-08T17:56:26Z

Teach git about a new option, "http.sslCipherList", which permits one to specify a list of ciphers to use when negotiating SSL connections. The setting can be overwridden by the GIT_SSL_CIPHER_LIST environment variable. Signed-off-by: Lars Kellogg-Stedman Signed-off-by: Junio C Hamano

http: release the memory of a http pack request as well

2015-03-24T19:36:10Z

The cleanup function is used in 4 places now and it's always safe to free up the memory as well. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'ye/http-accept-language'

2015-03-06T23:02:25Z

Compilation fix for a recent topic in 'master'. * ye/http-accept-language: gettext.c: move get_preferred_languages() from http.c

gettext.c: move get_preferred_languages() from http.c

2015-02-26T22:09:20Z

Calling setlocale(LC_MESSAGES, ...) directly from http.c, without including , was causing compilation warnings. Move the helper function to gettext.c that already includes the header and where locale-related issues are handled. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'tc/missing-http-proxyauth'

2015-02-25T23:40:12Z

We did not check the curl library version before using CURLOPT_PROXYAUTH feature that may not exist. * tc/missing-http-proxyauth: http: support curl < 7.10.7

Merge branch 'jk/dumb-http-idx-fetch-fix' into maint

2015-02-25T06:10:37Z

A broken pack .idx file in the receiving repository prevented the dumb http transport from fetching a good copy of it from the other side. * jk/dumb-http-idx-fetch-fix: dumb-http: do not pass NULL path to parse_pack_index

Merge branch 'ye/http-accept-language'

2015-02-18T19:44:57Z

Using environment variable LANGUAGE and friends on the client side, HTTP-based transports now send Accept-Language when making requests. * ye/http-accept-language: http: add Accept-Language header if possible