From: "Force Charlie via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Force Charlie <charlieio@outlook.com>
Subject: [PATCH v6 1/1] http: add support selecting http version
Date: Wed, 07 Nov 2018 23:00:08 -0800 (PST) [thread overview]
Message-ID: <93fda67198441c159bfcf1dfa467ad76f3ecba76.1541660405.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.69.v6.git.gitgitgadget@gmail.com>
From: Force Charlie <charlieio@outlook.com>
Usually we don't need to set libcurl to choose which version of the
HTTP protocol to use to communicate with a server.
But different versions of libcurl, the default value is not the same.
CURL >= 7.62.0: CURL_HTTP_VERSION_2TLS
CURL < 7.62: CURL_HTTP_VERSION_1_1
In order to give users the freedom to control the HTTP version,
we need to add a setting to choose which HTTP version to use.
Signed-off-by: Force Charlie <charlieio@outlook.com>
---
Documentation/config.txt | 9 +++++++++
http.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 41a9ff2b6a..f397942128 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1935,6 +1935,15 @@ 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.version::
+ Use the specified HTTP protocol version when communicating with a server.
+ If you want to force the default. The available and default version depend
+ on libcurl. Actually the possible values of
+ this option are:
+
+ - HTTP/2
+ - HTTP/1.1
+
http.sslVersion::
The SSL version to use when negotiating an SSL connection, if you
want to force the default. The available and default version
diff --git a/http.c b/http.c
index 3dc8c560d6..d6f3c4ee80 100644
--- a/http.c
+++ b/http.c
@@ -48,6 +48,7 @@ char curl_errorstr[CURL_ERROR_SIZE];
static int curl_ssl_verify = -1;
static int curl_ssl_try;
+static const char *curl_http_version = NULL;
static const char *ssl_cert;
static const char *ssl_cipherlist;
static const char *ssl_version;
@@ -284,6 +285,9 @@ static void process_curl_messages(void)
static int http_options(const char *var, const char *value, void *cb)
{
+ if (!strcmp("http.version",var)) {
+ return git_config_string(&curl_http_version, var, value);
+ }
if (!strcmp("http.sslverify", var)) {
curl_ssl_verify = git_config_bool(var, value);
return 0;
@@ -789,6 +793,30 @@ static long get_curl_allowed_protocols(int from_user)
}
#endif
+#if LIBCURL_VERSION_NUM >=0x072f00
+static int get_curl_http_version_opt(const char *version_string, long *opt)
+{
+ int i;
+ static struct {
+ const char *name;
+ long opt_token;
+ } choice[] = {
+ { "HTTP/1.1", CURL_HTTP_VERSION_1_1 },
+ { "HTTP/2", CURL_HTTP_VERSION_2 }
+ };
+
+ for (i = 0; i < ARRAY_SIZE(choice); i++) {
+ if (!strcmp(version_string, choice[i].name)) {
+ *opt = choice[i].opt_token;
+ return 0;
+ }
+ }
+
+ return -1; /* not found */
+}
+
+#endif
+
static CURL *get_curl_handle(void)
{
CURL *result = curl_easy_init();
@@ -806,6 +834,16 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
}
+#if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0
+ if (curl_http_version) {
+ long opt;
+ if (!get_curl_http_version_opt(curl_http_version, &opt)) {
+ /* Set request use http version */
+ curl_easy_setopt(result, CURLOPT_HTTP_VERSION,opt);
+ }
+ }
+#endif
+
#if LIBCURL_VERSION_NUM >= 0x070907
curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
#endif
--
gitgitgadget
next prev parent reply other threads:[~2018-11-08 7:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 13:33 [PATCH 0/1] http: add support selecting http version Force.Charlie-I via GitGitGadget
2018-11-07 13:33 ` [PATCH 1/1] " Force Charlie via GitGitGadget
2018-11-08 1:48 ` Junio C Hamano
2018-11-07 13:44 ` [PATCH 0/1] " Daniel Stenberg
2018-11-08 1:18 ` brian m. carlson
2018-11-08 3:35 ` Junio C Hamano
2018-11-08 1:35 ` [PATCH v2 0/3] " Force.Charlie-I via GitGitGadget
2018-11-08 1:35 ` [PATCH v2 1/3] " Force Charlie via GitGitGadget
2018-11-08 1:35 ` [PATCH v2 2/3] support force use http 1.1 Force Charlie via GitGitGadget
2018-11-08 1:35 ` [PATCH v2 3/3] fix curl version to support CURL_HTTP_VERSION_2TLS Force Charlie via GitGitGadget
2018-11-08 4:54 ` [PATCH v3 0/4] http: add support selecting http version Force.Charlie-I via GitGitGadget
2018-11-08 4:54 ` [PATCH v3 1/4] " Force Charlie via GitGitGadget
2018-11-08 4:55 ` [PATCH v3 2/4] support force use http 1.1 Force Charlie via GitGitGadget
2018-11-08 4:55 ` [PATCH v3 3/4] fix curl version to support CURL_HTTP_VERSION_2TLS Force Charlie via GitGitGadget
2018-11-08 4:55 ` [PATCH v3 4/4] http: change http.version value type Force Charlie via GitGitGadget
2018-11-08 6:14 ` [PATCH v4 0/4] http: add support selecting http version Force.Charlie-I via GitGitGadget
2018-11-08 6:14 ` [PATCH v4 1/4] " Force Charlie via GitGitGadget
2018-11-08 6:14 ` [PATCH v4 2/4] support force use http 1.1 Force Charlie via GitGitGadget
2018-11-08 6:14 ` [PATCH v4 3/4] fix curl version to support CURL_HTTP_VERSION_2TLS Force Charlie via GitGitGadget
2018-11-08 6:14 ` [PATCH v4 4/4] http: change http.version value type Force Charlie via GitGitGadget
2018-11-08 6:18 ` [PATCH v5 0/1] http: add support selecting http version Force.Charlie-I via GitGitGadget
2018-11-08 6:18 ` [PATCH v5 1/1] " Force Charlie via GitGitGadget
2018-11-08 7:00 ` [PATCH v6 0/1] " Force.Charlie-I via GitGitGadget
2018-11-08 7:00 ` Force Charlie via GitGitGadget [this message]
2018-11-08 18:02 ` [PATCH v6 1/1] " Eric Sunshine
2018-11-09 2:57 ` Junio C Hamano
2018-11-09 2:56 ` Junio C Hamano
2018-11-08 23:15 ` [PATCH v7 0/1] " Force.Charlie-I via GitGitGadget
2018-11-08 23:15 ` [PATCH v7 1/1] " Force Charlie via GitGitGadget
2018-11-09 3:52 ` Junio C Hamano
2018-11-09 3:44 ` [PATCH v8 0/1] " Force.Charlie-I via GitGitGadget
2018-11-09 3:44 ` [PATCH v8 1/1] " Force Charlie via GitGitGadget
2018-11-08 6:14 ` [PATCH v3 0/4] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=93fda67198441c159bfcf1dfa467ad76f3ecba76.1541660405.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=charlieio@outlook.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).