From patchwork Thu Nov 8 06:14:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Perry via GitGitGadget X-Patchwork-Id: 10673533 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA03614E2 for ; Thu, 8 Nov 2018 06:14:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCE12CA63 for ; Thu, 8 Nov 2018 06:14:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AD842CF9E; Thu, 8 Nov 2018 06:14:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C0572C751 for ; Thu, 8 Nov 2018 06:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726687AbeKHPr7 (ORCPT ); Thu, 8 Nov 2018 10:47:59 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:35618 "EHLO mail-pl1-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725953AbeKHPr4 (ORCPT ); Thu, 8 Nov 2018 10:47:56 -0500 Received: by mail-pl1-f174.google.com with SMTP id n4-v6so9043518plp.2 for ; Wed, 07 Nov 2018 22:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=pwaq1k7tbXYZJbON+5QUf3xRvroHi6fk057jEUhtDRQ=; b=Fvg6/5Vmw9oaP1uyVmnS+CS4jORm0/hapmsEAmeIpTiekps37clo+5Mf5S3MVVtVbR m8w6/Lr+aJvcX+YujM8f4NbnLEFxpE9BLeadHzE0VSLikosI40CdxW1iZbK0210Bc1C7 w8XqXBue2dOaUc3H+REMWQAr9lXolZezdVZTPRBeJUGA1SpCVVGgIEMCyYBm5JgWEeI8 n9Zc3gwj4m0Z7Junxa9GhqzYdQ01UL3kbm7ZYr/DhlWuiVDcUUciJ14g8LhuPO6GCpIK zeOPrZve1hm8w/z7wtUy5gXcat3E2E5TaGXFtgG8bOieuG3jisP248sNDKwtocDSEEtN pcGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=pwaq1k7tbXYZJbON+5QUf3xRvroHi6fk057jEUhtDRQ=; b=N7yLD7u9aPlugecHy5OOWXuKlmxr1vXbGDSvJ9DG4CJlKZKYBP+M8LDGLdSGlAtEKn cyQwQaoBPozDPM7Eu6iR3RX0/NIHEYJTQz+47m47L4lZjJq3C89J8h2tMur/X7nZdIFQ 74Eu8yjQlFhZTNQL9GOXxoT7pvnEWNdZwItXSbHuSFGq2+KcV6wHVvEiohJusjORmDH4 t90esiD9ZVfFUq7lXxrzka92751feBvbESVWhO/+FriJs11Q00vJm6s67eRrpB9+CHlC F51RhzglH17+jLGbq+2MwBKAKIzZRbfuhk2CdYmAJO5Q5H8utn4v2QrWCYuhHrVorKvj UMgA== X-Gm-Message-State: AGRZ1gLppK0LRxl42IXlSofm9xPbuWahU5qPh1nNJvOsqFVb3OegTtF8 X0m1CH3sJtC253kJMuJ3kZnSMZ0H X-Google-Smtp-Source: AJdET5fdOv1G+G6kCgEdHVgf2Ie/Fz0BHze0bfl6XWOC6FBYrzbcUa2XQV6vhRlF78eUkvNtq+51zQ== X-Received: by 2002:a17:902:20c5:: with SMTP id v5-v6mr3355385plg.156.1541657644617; Wed, 07 Nov 2018 22:14:04 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id s22-v6sm4488631pfi.15.2018.11.07.22.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 22:14:03 -0800 (PST) Date: Wed, 07 Nov 2018 22:14:03 -0800 (PST) X-Google-Original-Date: Thu, 08 Nov 2018 06:13:57 GMT Message-Id: <4f5a935c4355794effb23c979dcbaf77ed33da26.1541657640.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Force Charlie via GitGitGadget" Subject: [PATCH v4 1/4] http: add support selecting http version Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Force Charlie Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Force Charlie Signed-off-by: Force Charlie --- http.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/http.c b/http.c index 3dc8c560d6..99cb04faba 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 int curl_http_version = 11; static const char *ssl_cert; static const char *ssl_cipherlist; static const char *ssl_version; @@ -284,6 +285,10 @@ static void process_curl_messages(void) static int http_options(const char *var, const char *value, void *cb) { + if (!strcmp("http.version",var)) { + curl_http_version=git_config_int(var,value); + return 0; + } if (!strcmp("http.sslverify", var)) { curl_ssl_verify = git_config_bool(var, value); return 0; @@ -806,6 +811,13 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2); } +#if LIBCURL_VERSION_NUM >= 0x073100 + if(curl_http_version == 20){ + /* CURL Enable HTTP2*/ + curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2); + } +#endif + #if LIBCURL_VERSION_NUM >= 0x070907 curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); #endif From patchwork Thu Nov 8 06:14:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Perry via GitGitGadget X-Patchwork-Id: 10673529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE1C9175A for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A01D92CC96 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 944552CFE6; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34F5C2CC96 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbeKHPr7 (ORCPT ); Thu, 8 Nov 2018 10:47:59 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:37087 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726653AbeKHPr7 (ORCPT ); Thu, 8 Nov 2018 10:47:59 -0500 Received: by mail-pf1-f194.google.com with SMTP id u13-v6so8837721pfm.4 for ; Wed, 07 Nov 2018 22:14:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TEACPUbf9LKilUsENgqE1AsKA4VNCAyaGbrfWRTpqTs=; b=GJMEpHMRfwf8LNulTr6BxNiuG+mukHpEiiJop7ipIe0qgKNtC0yyOvZgnjAlt2jvNT HuRhSBRhoXqC1SsTq+K9/SlMHHvAsTy+GdRwQAfVfRrNFbgzvKtrHPZIioFaKzg3HR3+ gAG/raj4TX1H+ty5F/w6nbz3D0/j/N8HpmdX3sQefxI2QTqKzWgFgn4wXPfgLPR3AcW8 fKxDvarlA2bLAqSCHWmhSZMEcJPwQ8zQBdaGaCXNZT1RJxM04lAdANC2HEAMs9Vy9Lt5 2n7G0SyQFjudqpMgP8Y4F6x1A237wADIRLmWSctFsVUit3Y/Uqf7dr0UcWV+Jt/iBfbK IlOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TEACPUbf9LKilUsENgqE1AsKA4VNCAyaGbrfWRTpqTs=; b=RUxTPOSmydPJ3Igj2jLy0ntYud4wi2xRBPDbTJX++mKBtbsLmOnItAQF4CmZm4HgV2 dOVS00vWflJoqr0wplQQlaBfq3WEphwIH+9Y9YmuVTVKotWnKcGsuxE+X0yj/+3t0fAw PZfBmwR2MVkLDT9IPC2zX3bBTKkoz3RPOOruFFG6N2XL+XVwf7wwIVSKsDYRu0RQn+89 2G9oiXj9NDUaPR8RM3cLXOa2G9xg70wIYSwHVdoYrQW5wU14bg3D5vhXOpv+84ZDP693 WQsebX4rQ/TzrpZfdQRLJW6gTi5723E26kjDjx0XT1gP9wKwNLgZ5mHJ9B3OMHQ6oEr7 otqg== X-Gm-Message-State: AGRZ1gJgfww33bdDS4mgc8bIuriHgyE2xnz5AcQBxbIzOzIJutT+/GIg g/o0zOMPVon7XGTj0HG427aGXZJp X-Google-Smtp-Source: AJdET5fK9hhEcZZ/FhHpPxUJwI14RX7zTvH4jEkgM0jovJw2CK25NUPeCUjJzZgnNHlhZlcUzWEaXg== X-Received: by 2002:a65:4b82:: with SMTP id t2mr2805570pgq.189.1541657645808; Wed, 07 Nov 2018 22:14:05 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id c7-v6sm2972248pfh.25.2018.11.07.22.14.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 22:14:05 -0800 (PST) Date: Wed, 07 Nov 2018 22:14:05 -0800 (PST) X-Google-Original-Date: Thu, 08 Nov 2018 06:13:58 GMT Message-Id: <06e9685d2bcef99d6635bd928845156b1580062f.1541657640.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Force Charlie via GitGitGadget" Subject: [PATCH v4 2/4] support force use http 1.1 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Force Charlie Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Force Charlie Signed-off-by: Force Charlie --- http.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 99cb04faba..b2ec31aef5 100644 --- a/http.c +++ b/http.c @@ -48,7 +48,7 @@ char curl_errorstr[CURL_ERROR_SIZE]; static int curl_ssl_verify = -1; static int curl_ssl_try; -static int curl_http_version = 11; +static int curl_http_version = 0; static const char *ssl_cert; static const char *ssl_cipherlist; static const char *ssl_version; @@ -811,11 +811,14 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2); } -#if LIBCURL_VERSION_NUM >= 0x073100 - if(curl_http_version == 20){ - /* CURL Enable HTTP2*/ - curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2); - } +#if LIBCURL_VERSION_NUM >= 0x074700 + // curl_http_version 0 is default. + if (curl_http_version == 20) { + /* Enable HTTP2 when request TLS*/ + curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2TLS); + } else if (curl_http_version == 11) { + curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_1_1); + } #endif #if LIBCURL_VERSION_NUM >= 0x070907 From patchwork Thu Nov 8 06:14:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Perry via GitGitGadget X-Patchwork-Id: 10673527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A99914E2 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B1092CA23 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DD402CC51; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 461CD2CA23 for ; Thu, 8 Nov 2018 06:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726760AbeKHPr7 (ORCPT ); Thu, 8 Nov 2018 10:47:59 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42348 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbeKHPr7 (ORCPT ); Thu, 8 Nov 2018 10:47:59 -0500 Received: by mail-pg1-f195.google.com with SMTP id i4-v6so8399939pgq.9 for ; Wed, 07 Nov 2018 22:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=LNZMhKlfrAQX+xT84qOrzO8agUCG35LSD7aXqa1Azg4=; b=BmbgUvp3aQIsruHTVpUzJ3jlNiBL3Y/ltCH8u/WeGPEzXlApMfBkkAZ/1LihG8hXKU IVi8RKWE2ac/JAxvXsBI7nl6iN5YNOk+HCgtqXBWopJUgsW3uSR6WLzJ7eTKRdhrUASj 4MGaD36Mj2tUEJUgC/13DufiMcYX6363L/CSjetrlxnnHHr1saC2aNZ0yjfjiTFklLZa txtXs2LbdH6mn7JMdPhruwLIAz3CefemUVo04GcxISSuTGISppRwMwhePmps+0+zjg1g ORS05LGXwkPh2IcoNxjFmFAfiP5u/XPtuewKmMNvwVRFTzMw2MVpf85uZ4vDiwL4O+lb EiCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=LNZMhKlfrAQX+xT84qOrzO8agUCG35LSD7aXqa1Azg4=; b=IvPQj9ImrFkYI9WVLlQAfOo9ujl9XAaViGmR+RQ91YcYdnxkYwWZkmOtsioPDxpyXc TN1jJjl1DxmA2lngRcLXX4wmd3QPRTVbeedpn97hEfsWExOycgJ8T7s6ZX4bJo3OU6Mf 2c0h2A7g3l6uYo+y1DjwkG/w77HuqWJjAjy/ZHiH2S3dpsILHNeQrC9U2Hpl3turlfif 6PTA9KBmBATLuJrXhctqUROo26WDdMr+Fc4WKzJGpD0MVC/pUUPIwExEf1fae1EsYM7+ 2OSyy/1Jl8AQr9lBtOC6uYshRW70KWainh3wRt3ZdKpIi8z38Bxc4Z38U9RSjwO2nAEm GvTQ== X-Gm-Message-State: AGRZ1gKKiTBh1tFwztM8OJrkLNo5F+FkdhiVo+NDltV5djerTVh/xQRI f4OlN62aEfNQGNghNCOHJadDogZ9 X-Google-Smtp-Source: AJdET5dMRx4pfNe40ye0Y7doP640GwH5jKm7eokZ99z8cmjy9/tv63MBwV2suC86VHZAURJnlZCuPg== X-Received: by 2002:a63:6848:: with SMTP id d69-v6mr2861741pgc.113.1541657646988; Wed, 07 Nov 2018 22:14:06 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id d65-v6sm4343798pfm.100.2018.11.07.22.14.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 22:14:06 -0800 (PST) Date: Wed, 07 Nov 2018 22:14:06 -0800 (PST) X-Google-Original-Date: Thu, 08 Nov 2018 06:13:59 GMT Message-Id: In-Reply-To: References: From: "Force Charlie via GitGitGadget" Subject: [PATCH v4 3/4] fix curl version to support CURL_HTTP_VERSION_2TLS Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Force Charlie Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Force Charlie Signed-off-by: Force Charlie --- http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http.c b/http.c index b2ec31aef5..86e454cff5 100644 --- a/http.c +++ b/http.c @@ -811,10 +811,10 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2); } -#if LIBCURL_VERSION_NUM >= 0x074700 +#if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0 // curl_http_version 0 is default. if (curl_http_version == 20) { - /* Enable HTTP2 when request TLS*/ + /* Enable HTTP2*/ curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2TLS); } else if (curl_http_version == 11) { curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_1_1); From patchwork Thu Nov 8 06:14:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Perry via GitGitGadget X-Patchwork-Id: 10673531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D38F13AD for ; Thu, 8 Nov 2018 06:14:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0F162CA23 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E56A52CFE6; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8814C2CA23 for ; Thu, 8 Nov 2018 06:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbeKHPsB (ORCPT ); Thu, 8 Nov 2018 10:48:01 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:38433 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbeKHPsA (ORCPT ); Thu, 8 Nov 2018 10:48:00 -0500 Received: by mail-pl1-f195.google.com with SMTP id p4-v6so6651729plo.5 for ; Wed, 07 Nov 2018 22:14:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=JnXd8/N+iLE/BmW5Y4QyW8SELbG7EamjSilcrlX0z+U=; b=eh07nuujFOMIwmy8RAoUMSnI8eT+tbQt4wsXsN0JRyYDh3i66NmBOdJVBWFhNRHFES 5AsOWeKzEm7pOXc0ACSsVVQIL9pApr6irmYhlCB432jdf4SdlizZxTnowaWBn7/YxYNX 2n500bWH9aYEPMPYu20x41tC82lllBJnyE4unj23TRmqgT9BXzuaOGbOdjQv1pdPFJI8 JXnV8EIHz+o/Xm0gYBsDOZiUMb6bsnDdwcNggw3JO8PYUYc65a4cP9cb3CvtAzJvR+0n 69DtROEZxhiRWyNgxw8Z/pth7SJI9uCHmewekCvmwSblkDT/CMChNzEi6NAFDfbDqasj s++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=JnXd8/N+iLE/BmW5Y4QyW8SELbG7EamjSilcrlX0z+U=; b=Qr7+Mbs7QFsp6HzkIeuS9Xhr15ntKKzBuWhOalghEWjvwEWFrYtLciLCfAhfFW6HNP C/77lLrAJdWX1HJL5kFnz6Oog8lDAx18nZX/xX+fI7d/6bbjeFQvp+VA5gdJliCcQHhV noVPGufqzi4bB9d/CFyKf4Ma4yibq9rjdNmMps9scvh/1e56dM07q+jItWIKMrYgbRaL hVrFLWNxBQTz7NuJKYrZIe3xcw6JCc6Gh0vL8F9On2tF9M4TmNI4vUB1mxe09gQwEM+q LCtLf1kfxpv4ROeMj/BN/0INl07Z7+lrHCCmbJCwZjtrmX8euqSN59EyndqR8WfsM8DC B/hQ== X-Gm-Message-State: AGRZ1gJSFla6SMwvqoEzU16SdTkG79yevrJeFQe/LnDe4zLs3A/xmxe9 CLAWzitdnoyXY9axVARgD0l/NgV4 X-Google-Smtp-Source: AJdET5cIZBw0Lsp0oXB5QKaLrnooU8XPP/eJEwhoWQWLEUj6yNqSalv0De5ENxqxy3TOgtg3CdcHGA== X-Received: by 2002:a17:902:166:: with SMTP id 93-v6mr3254270plb.68.1541657648202; Wed, 07 Nov 2018 22:14:08 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id c127-v6sm2736923pfa.31.2018.11.07.22.14.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 22:14:07 -0800 (PST) Date: Wed, 07 Nov 2018 22:14:07 -0800 (PST) X-Google-Original-Date: Thu, 08 Nov 2018 06:14:00 GMT Message-Id: <0a7794722be9322dbf696e486d4ff6da7da5bc8b.1541657640.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Force Charlie via GitGitGadget" Subject: [PATCH v4 4/4] http: change http.version value type Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Force Charlie Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Force Charlie Signed-off-by: Force Charlie --- http.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/http.c b/http.c index 86e454cff5..d6f3c4ee80 100644 --- a/http.c +++ b/http.c @@ -48,7 +48,7 @@ char curl_errorstr[CURL_ERROR_SIZE]; static int curl_ssl_verify = -1; static int curl_ssl_try; -static int curl_http_version = 0; +static const char *curl_http_version = NULL; static const char *ssl_cert; static const char *ssl_cipherlist; static const char *ssl_version; @@ -286,8 +286,7 @@ static void process_curl_messages(void) static int http_options(const char *var, const char *value, void *cb) { if (!strcmp("http.version",var)) { - curl_http_version=git_config_int(var,value); - return 0; + return git_config_string(&curl_http_version, var, value); } if (!strcmp("http.sslverify", var)) { curl_ssl_verify = git_config_bool(var, value); @@ -794,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(); @@ -812,12 +835,12 @@ static CURL *get_curl_handle(void) } #if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0 - // curl_http_version 0 is default. - if (curl_http_version == 20) { - /* Enable HTTP2*/ - curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_2TLS); - } else if (curl_http_version == 11) { - curl_easy_setopt(result, CURLOPT_HTTP_VERSION,CURL_HTTP_VERSION_1_1); + 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