From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id CB2DB1F8C6 for ; Thu, 19 Aug 2021 13:18:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239792AbhHSNTA (ORCPT ); Thu, 19 Aug 2021 09:19:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233713AbhHSNS7 (ORCPT ); Thu, 19 Aug 2021 09:18:59 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74398C061575 for ; Thu, 19 Aug 2021 06:18:23 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id oc2-20020a17090b1c0200b00179e56772d6so1418463pjb.4 for ; Thu, 19 Aug 2021 06:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KSoNpPY+3m8vcI3uMv87aMIKwTpOP3ef572yWKlD8fE=; b=lT/nYIh1MlNhzPTONJNfLvpPMq38KIdvFD2sx+c5gNChOiGZQRN9H+wbG7CXejVAr1 sYoBnA6YkXqHGFmNX8kMuRK0p5bGNWqCQmeoAQ6Uv6CY5mvTynA0PAkDy+LhF+Deib9m YAgeJD4b7ZUKbX80R5NVTXxn9zQpp3cw8i7/2YWweZ0hQVHyQTPM6tz/uiJl6XuUhq8m XSAjXpCco/TYDI9vB7hpbJlz1B305g1lwrN1OhBLhImgt4cfFK9U5IrVE8NCucWyPS8t KsIM4DY5N6Scbngx/e6PJcILfPiRtvm6meHzw8vQGTY5sAiDBvZlQ28E83Zyrv56VlFi RL1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KSoNpPY+3m8vcI3uMv87aMIKwTpOP3ef572yWKlD8fE=; b=CwXJFKEQEp0d3fsG9w57XnAar6CCGdjn5Ue6/fSnFOQOL4wHE5PMZHWKuPVTBplqpQ e/llSuFyZOQPprzfRNxHf45aqYi9LhX5mWCCZlFB6nh0i0TqbVpnoh3DR72PSYvpYjEU LIgdjoaucftALCSnqPMd0d30ct/C25hEUH2HSxGz+NVbcby7O+NTEqxe5cJdFDFRXcLh sjWgdRWmt0bw5cTFLYeORYgcTOdh/6WruNGlMWdcaFTZQyHgK3oa/ETJQz6oWHUpLyqu 9VAx5Lo+T59sMSW8H43lQsaK6gJCsfhZLDUcknplmMpWwsGc63ju6qbIZHCcuZa4Am/q OpmQ== X-Gm-Message-State: AOAM530Pb14I/MdNnCVCa8Opv5c8m3ny2H89nBXdtToyLOj5I/97vA3g s8drAe0+/tcvLC9EJ08ee9nYOpLOuoL8+FtX X-Google-Smtp-Source: ABdhPJylLqXmvkop1PQYi1w1CoePLFSGXNvRfUR+lDB4GoHMQkBaK+4GHWOLFpwUA5JOVi9EwAT/bA== X-Received: by 2002:a17:90b:3014:: with SMTP id hg20mr15377562pjb.140.1629379102775; Thu, 19 Aug 2021 06:18:22 -0700 (PDT) Received: from localhost.localdomain ([47.246.98.145]) by smtp.gmail.com with ESMTPSA id j187sm3403853pfb.132.2021.08.19.06.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 06:18:21 -0700 (PDT) From: Xia XiaoWen X-Google-Original-From: Xia XiaoWen To: git@vger.kernel.org Cc: gitster@pobox.com, peff@peff.net, worldhello.net@gmail.com, Xia XiaoWen Subject: [PATCH 1/2] add http.maxReceiveSpeed to limit git-receive-pack receiving speed Date: Thu, 19 Aug 2021 21:18:07 +0800 Message-Id: <20210819131808.40759-1-chenan.xxw@alibaba-inc.com> X-Mailer: git-send-email 2.28.1.49.gafcb914ae4.dirty.agit.6.3.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sometimes need to limit the receive speed of git `clone/fetch` because of the limited network bandwidth, otherwise will prevent other applications from using the network normally. Add `http.maxReceiveSpeed` to limit `git-receive-pack` receiving speed, Can be overridden by `GIT_HTTP_MAX_RECEIVE_SPEED` eivironment variable. The default is unlimited, same if the value is 0 or negative. The default unit is Bytes/s, common unit suffixes of k, m, or g are supported. this configuration is valid for `clone`, `fetch`, `pull` commands of the https protocol, and only supports libcurl 7.15.5 and above. --- http.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/http.c b/http.c index 8119247149..12030cf3bc 100644 --- a/http.c +++ b/http.c @@ -83,6 +83,9 @@ static const char *ssl_pinnedkey; static const char *ssl_cainfo; static long curl_low_speed_limit = -1; static long curl_low_speed_time = -1; +#if LIBCURL_VERSION_NUM >= 0x070f05 +static ssize_t curl_max_receive_speed = -1; +#endif static int curl_ftp_no_epsv; static const char *curl_http_proxy; static const char *http_proxy_authmethod; @@ -361,7 +364,12 @@ static int http_options(const char *var, const char *value, void *cb) curl_low_speed_time = (long)git_config_int(var, value); return 0; } - +#if LIBCURL_VERSION_NUM >= 0x070f05 + if (!strcmp("http.maxreceivespeed", var)) { + curl_max_receive_speed = git_config_ssize_t(var, value); + return 0; + } +#endif if (!strcmp("http.noepsv", var)) { curl_ftp_no_epsv = git_config_bool(var, value); return 0; @@ -974,6 +982,12 @@ static CURL *get_curl_handle(void) curl_low_speed_time); } +#if LIBCURL_VERSION_NUM >= 0x070f05 + if (curl_max_receive_speed > 0) + curl_easy_setopt(result, CURLOPT_MAX_RECV_SPEED_LARGE, + curl_max_receive_speed); +#endif + curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20); #if LIBCURL_VERSION_NUM >= 0x071301 curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); @@ -1105,6 +1119,9 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) { char *low_speed_limit; char *low_speed_time; +#if LIBCURL_VERSION_NUM >= 0x070f05 + char *max_receive_speed; +#endif char *normalized_url; struct urlmatch_config config = { STRING_LIST_INIT_DUP }; @@ -1196,6 +1213,11 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME"); if (low_speed_time != NULL) curl_low_speed_time = strtol(low_speed_time, NULL, 10); +#if LIBCURL_VERSION_NUM >= 0x070f05 + max_receive_speed = getenv("GIT_HTTP_MAX_RECEIVE_SPEED"); + if (max_receive_speed && !git_parse_ssize_t(max_receive_speed, &curl_max_receive_speed)) + warning("failed to parse GIT_HTTP_MAX_RECEIVE_SPEED: %s", max_receive_speed); +#endif if (curl_ssl_verify == -1) curl_ssl_verify = 1; -- 2.28.1.49.gafcb914ae4.dirty.agit.6.3.1