summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-26 22:45:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-26 22:45:31 (GMT)
commited070a40072f01aa819f114bf6b35edf0f53cab2 (patch)
tree89dd1feca83ee6672db5cf893b7a8f9dfd00705b /Documentation
parent51e83a4898b47ff3286f1cff65c3715ee803ade9 (diff)
parent01861cb7a27b948bc0218877311f531f25386691 (diff)
downloadgit-ed070a40072f01aa819f114bf6b35edf0f53cab2.zip
git-ed070a40072f01aa819f114bf6b35edf0f53cab2.tar.gz
git-ed070a40072f01aa819f114bf6b35edf0f53cab2.tar.bz2
Merge branch 'ep/http-configure-ssl-version'
A new configuration variable http.sslVersion can be used to specify what specific version of SSL/TLS to use to make a connection. * ep/http-configure-ssl-version: http: add support for specifying the SSL version
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt23
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 75ec02e..be557f4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1609,6 +1609,29 @@ http.saveCookies::
If set, store cookies received during requests to the file specified by
http.cookieFile. Has no effect if http.cookieFile is unset.
+http.sslVersion::
+ The SSL version to use when negotiating an SSL connection, if you
+ want to force the default. The available and default version
+ depend on whether libcurl was built against NSS or OpenSSL and the
+ particular configuration of the crypto library in use. Internally
+ this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl
+ documentation for more details on the format of this option and
+ for the ssl version supported. Actually the possible values of
+ this option are:
+
+ - sslv2
+ - sslv3
+ - tlsv1
+ - tlsv1.0
+ - tlsv1.1
+ - tlsv1.2
+
++
+Can be overridden by the 'GIT_SSL_VERSION' environment variable.
+To force git to use libcurl's default ssl version and ignore any
+explicit http.sslversion option, set 'GIT_SSL_VERSION' to the
+empty string.
+
http.sslCipherList::
A list of SSL ciphers to use when negotiating an SSL connection.
The available ciphers depend on whether libcurl was built against