From patchwork Wed Mar 19 22:23:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14023238 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDD4521C165 for ; Wed, 19 Mar 2025 22:23:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423031; cv=none; b=Vk33ZLAKDSVlhaS4topoUMHMnfE+bqyXu2flx2otPDoe0YfP1hOUFE5E1xPukYPWfayNpjX0q+QdZ9BKkqyIQ9/FCImE7gxpNiM9xJgdd7Qoab41nQfTZxjLFsNHa8rCCJFaCQCQYxv2cA3QwUhgaxyQzNOVRu2sXxLoNg9w3P4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423031; c=relaxed/simple; bh=44fuOkf9smCJfTZbZeQAk6fjEnv4kItUV1yCA1Cw/3Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=sA+nXbuTOSudJ09U0jPzasdMxHMjsFJS05VLzMem42/8dy1iMS4U+thCiUhgDZbMx+z62XLz2eykJjxu6sJ72BCqWEIEHlJtM6kN3oWOKkxalN/iu+UsTQIJzAVBMdVBkqhhiXaVNf/1JJZunXTPxrwqPH+p0rLuiq2WoENAy0I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=C9H9KIaz; arc=none smtp.client-ip=209.85.160.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="C9H9KIaz" Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-46fcbb96ba9so3367761cf.0 for ; Wed, 19 Mar 2025 15:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742423028; x=1743027828; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=56LGHWOqTO6XqxlWytA+wBgHSoRDX7qpcLtW47pCkdI=; b=C9H9KIazXI0wt+TjTGp6f1T+nL5qJrc/aLYBrEgh6l55GfAl9wZd96/wGEJTW2Bh8R 2r0C6v/TiAEAVdIq2SDfACJjiYajBH8FRKWW7LHcpMBXyaJ22nkR3wttGzoDKcMOfy/G yy6EJSZA0nwlF+bX3+tOCJ29hwamLDVBsoYAuuXsJe+9jeLx5qbJDm2rSSpN30/vxQE9 uuhpEWEqh9/pXxhitqop1H8jmLkyKU3dyqcnm660IGVDmYxnWmLtTeDznxU8dhp8S51d ea161if4PpQ2EsZ+TCYeqjksgdm2AW9jXy2RXWUTqNlh0M/cFMe7AvlfZrITyfz3K+XI EzFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742423028; x=1743027828; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=56LGHWOqTO6XqxlWytA+wBgHSoRDX7qpcLtW47pCkdI=; b=cYAmrY1uRjviU5+NMPZbRXDmfb2q/42yIUM6WF6BA8ZqrtHk/ZqWrRSa+XbxEG3de2 3zs5+nIUH1X7h21SWMQxj5jj6MXYGSEE3W6Kllk79GJZdcWGSuqbENUWmWzR3/7cnhiY PL+x2kIWqUg4d6t7Zlz2oga1zcyBL5PVCaAQ/0h84Lz+ecRwtzVIcL26swKyiYVdkl5d 4nnUR+QTeyTE/cpkPtDcnvEhQCwl8K9Sbr8DXIpg9eqOBqbFQkXqQ5PQByqrP/2pcetW YO2ogX8VdR+1C2ovKNvcZzaSoehfSTFqBbH0iz+unsGiV0/SRNeAWoWY4Ep2XFyqYqOY aTZg== X-Gm-Message-State: AOJu0YwHJDidJJS9KtsgsXh9UipVJyqCwbQ9RaG8WrCgHQ9lE1pABB+L 53I82TMUTTdIT0/14yle3FPG56uAwZSkZg95Yw7xdPJPVfA0kW2q1/0V7VA2BF+S6V3ywFn3GXX ch30= X-Gm-Gg: ASbGncuJzVe3Vih+m+neLVQ6DR0/WASj3xW7gxMgHQR1awErmI7Z2F8/aYMK13V56Vt 9qF9FSqsGNTWNVBFRInFpvLpNcA/vrflVmQN7gxBvHoi9BnPUg6L9YhVsL+kEeRSANiwb9jyzwY uhg/gHXuQnmHzQ8X85RgsQgECLYBbRXn+ExtBv7utUmnbOWA0GD5kpER59IaVPdfijtCK4eO1/Z YZkmoKZwiqiL+Q29mwsp0g4dCpDRIxKIkR3xRMkr5YFfPjFpPRPpGpcZwxmiarS9YXXFIiahFiE oXGP8yNIg+q/O9wyIxUqjbydiUp3oOpw/KZmydDMt6vq4JW4l/EffFnHfYehwDuE/uWTv0mbCsi 4hHJH0pcKO0RN91I5 X-Google-Smtp-Source: AGHT+IFh9Dw5TYO54a1Efac3vgx9Q/wsDmx0+RH2fqtWrIh+U7ddLtiYFVPyPb+vOUAFYCcVnyoAxQ== X-Received: by 2002:a05:622a:5c92:b0:476:b783:aae8 with SMTP id d75a77b69052e-4770834eaa9mr73059211cf.26.1742423028385; Wed, 19 Mar 2025 15:23:48 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-476bb7f1f39sm84400801cf.52.2025.03.19.15.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 15:23:48 -0700 (PDT) Date: Wed, 19 Mar 2025 18:23:46 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Patrick Steinhardt Subject: [PATCH v2 1/4] http.c: remove unnecessary casts to long Message-ID: <204e5e18d28951c3cb3c2e70f41873b263b65746.1742423021.git.me@ttaylorr.com> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: When parsing 'http.lowSpeedLimit' and 'http.lowSpeedTime', we explicitly cast the result of 'git_config_int()' to a long before assignment. This cast has been in place since all the way back in 58e60dd203 (Add support for pushing to a remote repository using HTTP/DAV, 2005-11-02). But that cast has always been unnecessary, since long is guaranteed to be at least as wide as int. Let's drop the cast accordingly. Noticed-by: Patrick Steinhardt Signed-off-by: Taylor Blau --- http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http.c b/http.c index 0c9a872809..0cbcb079b2 100644 --- a/http.c +++ b/http.c @@ -438,11 +438,11 @@ static int http_options(const char *var, const char *value, return 0; } if (!strcmp("http.lowspeedlimit", var)) { - curl_low_speed_limit = (long)git_config_int(var, value, ctx->kvi); + curl_low_speed_limit = git_config_int(var, value, ctx->kvi); return 0; } if (!strcmp("http.lowspeedtime", var)) { - curl_low_speed_time = (long)git_config_int(var, value, ctx->kvi); + curl_low_speed_time = git_config_int(var, value, ctx->kvi); return 0; } From patchwork Wed Mar 19 22:23:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14023239 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46C2621C165 for ; Wed, 19 Mar 2025 22:23:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423034; cv=none; b=PMaIP8m1pY+oeHRjAW/g1EwTjPxLIT9VYYmKbBBYBJa1DZxaNM/y5YfZPN76xDoxXcuY5ueHCgHWf8f+Yvh63k+a29eHrwg62dalK20eBLI3RFZjLe5++5qe7p3+CFTo7jQ2Q62vjZHIxQn/wabBiiI1902G6uhMCDIWjF11K94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423034; c=relaxed/simple; bh=LAbGcmcy1CtfnPV0Ow4SWyx4hucnLo3BRv4IvhJqlig=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZEapy1LN7AOTlD2b++hYaqk5k5GgPNZC+2BilAnnNOX/29vN/d0oHl1RkL8JTdVPQM1tkDMJM7Qb3/Trx8XM92vWVfnCnCVXa+36SF01zLXIcnPembO3EstNkmm+qPlj5XD+Xy8vWTV9ijR6WbGaE3ZkUxBjDZmiOCQSA9T+fIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=fcGOfZAJ; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="fcGOfZAJ" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6e8fc176825so1304276d6.0 for ; Wed, 19 Mar 2025 15:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742423032; x=1743027832; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ciOryr52jhuETvpmmgojQBHZoAfhFTrPvrlnenjhGE8=; b=fcGOfZAJOmn4urKGT9aeQ2tKRujY8392ZR/25zauRFFhpBOkfIGtw27A6Kt0/x8xU3 LgvoAl/YnPladREiADM5A9jDTDll+Anehb6SGZHQDyNCzseHFZK4GFPy2/NGzyqU232D lg7NEP5ot+rwgjf939Ht87JhAEUXLzzrDjQAVRW8ix2b6lMS7Nzbp0DigLb5P9s3gnzB Z+QEvXTN+sGBRUKsm8jyq6Cxfzrs0BOokR291KhM6cnhh0ekaHfLcAKY3cg8uGdoCH/s NtX3wewXZIg1gw6aMKedxx4EK08g9vBj9BGfPN7pfYMUfkXmo0+T/RX4PLKX4JNrWeh7 LKvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742423032; x=1743027832; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ciOryr52jhuETvpmmgojQBHZoAfhFTrPvrlnenjhGE8=; b=Uu9LqfbkTMaLQq+L4OxQgMrh2v8ztvX32SvVNh2kOEj/GtZFWmIt1JyCiuOUKdrJhO BnOQdTdYkL+qISgJyf27OtAUcZoCCKZriS3bIdvhKyPjbfI76dkDOUd53p/mbzl6e2/j 7T4qVDlUOExNjw+C5ZdpZ8K6lpRQ2r0R9NZKMkFiF/jG/arE3rbAfiee+ghHKLlc9/iQ JMG4+tw0Eby7wTxZANH5QbsHCcRzxd2EsULPOCvWAUEeWL9voplJIPj2TdxQnbGbyCt1 CfXlTaC2QlAl0E4VBAsWkgbrAjVIAiQU2RImqjEXcpFgYAbfiRqXqsH61G14RR9MmUdi MuEw== X-Gm-Message-State: AOJu0Yz0X4lWY5vZXzlRyvYT9UF2VtQSxGPbSucM066qffOxyodG+PTg ffvITdyF0kycXDQNC4jWy/fyDtZ5YxZikKTYr5ZtFpgYt3kwWV3iGGWUUSsR/s4HLwLnHKIsxM7 Z4PQ= X-Gm-Gg: ASbGncvwOBisWbm6YK715kYNpagxX69ZfqTd0BhBdq85wqSN3UHi27AbgNZ/GZNP26m 37XlU2kr6LA5qFfeAZhiYUpInfWMk7uxvJH/9q4JcicZBTa/6UxgeSaXvAmaNA5NFFHhOXwOhlv Pva6i3cffByfDbypjOkOehkwnJkvPBtGTQn/Pndis6fgzO2afgtsCI+HM1nwIZUKAMU3RtTcQrU bq/GzODyC6hVjh5APC4lA/OsOhSJvRHslhOiqgq/A4n1Gd7DIlLB1NNBlkJMzOhG4ROChe6WO/R gUIzAQ9a4XpyfIGb+BJxBaCpoOzMcbFtZsl1zqSyuv09jmMg56aAzGSHlpb2PdVSxT98NulJ1Qv zvnIpd27Tna9m2Jcd X-Google-Smtp-Source: AGHT+IFIpBY+R/w4ejVORafE0G+KAyj4+BZZBy0KhIhQHHf0ix9+P1m79IuM/MMexIzhB0KCFnwg9A== X-Received: by 2002:ad4:5bca:0:b0:6e8:feae:929c with SMTP id 6a1803df08f44-6eb2938c9fcmr67612276d6.21.1742423031829; Wed, 19 Mar 2025 15:23:51 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6eade24e7besm85170166d6.64.2025.03.19.15.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 15:23:51 -0700 (PDT) Date: Wed, 19 Mar 2025 18:23:50 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Patrick Steinhardt Subject: [PATCH v2 2/4] http.c: introduce `set_long_from_env()` for convenience Message-ID: <2e39a78e87edaf8f9842e510d05047dce647f4af.1742423021.git.me@ttaylorr.com> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: In 7059cd99fc (http_init(): Fix config file parsing, 2009-03-09), http.c gained a new "set_from_env()" function as a convenience function around conditionally assigning an environment variable to some variable if and only if the environment variable was set to begin with. But prior to 7059cd99fc, there were two spots which need to first strtol() whatever is set in the environment before assigning it to a long pointer. Both instances stored the result of getenv() in a temporary variable, and conditionally strtol() it depending on whether or not getenv() returned NULL. Replace those two instances with a new cousin of 'set_from_env()' called 'set_long_from_env()', which does what its name suggests. This allows us to remove the temporary variables and clean up some minor code duplication while also adding more robust error handling. More importantly, however, it prepares us for a future commit which will introduce more instances of assigning an environment variable to a long. Signed-off-by: Taylor Blau --- http.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/http.c b/http.c index 0cbcb079b2..17b676a1d5 100644 --- a/http.c +++ b/http.c @@ -1256,10 +1256,30 @@ static void set_from_env(char **var, const char *envname) } } +static void set_long_from_env(long *var, const char *envname) +{ + const char *val = getenv(envname); + if (val) { + long tmp; + char *endp; + int saved_errno = errno; + + errno = 0; + tmp = strtol(val, &endp, 10); + + if (errno) + warning_errno(_("failed to parse %s"), envname); + else if (*endp || endp == val) + warning(_("failed to parse %s"), envname); + else + *var = tmp; + + errno = saved_errno; + } +} + void http_init(struct remote *remote, const char *url, int proactive_auth) { - char *low_speed_limit; - char *low_speed_time; char *normalized_url; struct urlmatch_config config = URLMATCH_CONFIG_INIT; @@ -1338,12 +1358,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); - low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT"); - if (low_speed_limit) - curl_low_speed_limit = strtol(low_speed_limit, NULL, 10); - low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME"); - if (low_speed_time) - curl_low_speed_time = strtol(low_speed_time, NULL, 10); + set_long_from_env(&curl_low_speed_limit, "GIT_HTTP_LOW_SPEED_LIMIT"); + set_long_from_env(&curl_low_speed_time, "GIT_HTTP_LOW_SPEED_TIME"); if (curl_ssl_verify == -1) curl_ssl_verify = 1; From patchwork Wed Mar 19 22:23:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14023240 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1956E21C9F6 for ; Wed, 19 Mar 2025 22:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423037; cv=none; b=Jxu4vG2q5V1IXqEw9J97p50ol2CWExzM9ktK/2oiIcuhhjvjH8euOaU6U0E+VmXs6ZAErEybeSBYqhwYQXHgWzwzvfZYSx9dCuMIhr3E2rfsT7fTc+EiSmrogTBUAZesw7K8Y3oMmg5ifxo6GdEauGfPBAEwtL2JHOnrvPcK9dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423037; c=relaxed/simple; bh=9cMaNAi9xNqz3W5/h+etLsnvKiPXstReyenUu96jyFE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=if5EMPfGams6Yzf8KE2qigYa2UJGxJyCA/IrN0NFL8DxheJPIjjl7Rygr9OhGBFTgmd7wv0x7wyyhDRCv2ss6Ri7jFptIKZMtaY7wv5ARviDCnuYXeNYxdSFuvJFbbeJhQOsYcqSw+sd0M25wqHMKFhjb17zPPuTkeLg755VVzI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=XzUn6Dta; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="XzUn6Dta" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7c592764e54so22448385a.3 for ; Wed, 19 Mar 2025 15:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742423035; x=1743027835; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=oMChefzvT+dAiKVUTKVLKNX5EwwIbKWACIw5xIVHqgw=; b=XzUn6Dtave6TWgQNv4NrL2lC17i3T1s3RtBqgQuLwleRbeOwNhkQcOyhYPCYQGhAE0 2uMhLTm9KU6RKAZGidmEPi8ILBIXuXTLt4uKscgTfkiXRWk3bm0GV/Gc7RCMc+ylDaS4 dg5r46CogG8cGz3VebiMel0BpPbFvsm2vxkgf+bqqBaUdyEH5r8/XLmroiSGrMikjrBz mBqwonKGDfqL/8OBwJB05BRlXNIO1bbHPjEhgwNze1gJQkwJmLprZxwPYc2VXIxEjOpu npyBj06Pi9UkxLAOEUR3ozqtV5q61w46LGuSaQ0g56/DTmxHm6b5lUzacy+dAcMEzSjJ 5HIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742423035; x=1743027835; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oMChefzvT+dAiKVUTKVLKNX5EwwIbKWACIw5xIVHqgw=; b=wJiFwt3MXeonC+AzH3QZ7FpQHQug9cBBRmPKzakGNklfsSpEjbFuNKY+yElS8n4mgj i9YXLWGztsCU7e+Q9U9bdujEI2sHTtoUrTInV7p3PmQU/+ASfBZd/MHFKVc/0IvxQfgr /qbCaMe1wDpVF9DakN/iiQ6A4XGsgeLznIS+wPpdbJefkayjknmMBc35JwiDk7ATPIxm 9xW+xIErZ0l+sn75aXwpyvD1VI/L7RrOvpbFLDtq4po+fqsMUZjYBa48Zcfzx2Kew6K0 VnnRGZG9m/VVbWKVHHaLb71bgjFU3+TMN5MT9mC+GQKyr/rxjPgC+ovsy02VF1/yXofW K9Jg== X-Gm-Message-State: AOJu0YwlqDxHrauU/URK4uijSISAckxtXBKgea7ND7efZhLIvPxL3rJo ndHHK1ROER+wpEuwIry4UushEt7l2NVtqEkVvSc7T6XvjKsd5aLkvN0WUgXqeDVREQuhtYJlGum KEGk= X-Gm-Gg: ASbGncvUqgDusw2c+teBOQDI3ad3Myh1QestD6yrKvCZdxNzoqpuUSGxM5zp47g9ta3 A/j6luyzenW/Fr2eti7aqu+gvdTxed3BKH5iwpc8yrOyImckz7as33Qbk7VO/lBayiBBKPCU93i 6R1ti3AhoxGco2HsAkPQI0gl1Zm1l9p3ePeswhwBm96OatwrGinnnWuZBK9cwlqIFSrx2sg8sF9 SD1vQN+vzYQlytRs4XSl9oo7KlA9mrp5fD2nMj7zE2WaB8XJcV+mIBsA5syZ7cLV+S7CB9pYs8G H0Orq7XkZ0O/vuscVhmS3ANG7zAZq/fi6Rykn+4GnX+XbrRG9gx49JZI1AzZlFeeNq1JLOQZLsT xIqmpAKTMoNbhEAuA X-Google-Smtp-Source: AGHT+IHETo0YRi1o5bmRUoSM543DfnhJ1+Tbmwz8XNEXpxoRGxItmk3oN0xERONeOajF9efGseRdAg== X-Received: by 2002:a05:620a:4404:b0:7c5:6678:ab27 with SMTP id af79cd13be357-7c5b0c86132mr138003785a.18.1742423034861; Wed, 19 Mar 2025 15:23:54 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-7c573c6fafcsm910456485a.25.2025.03.19.15.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 15:23:54 -0700 (PDT) Date: Wed, 19 Mar 2025 18:23:53 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Patrick Steinhardt Subject: [PATCH v2 3/4] http.c: inline `set_curl_keepalive()` Message-ID: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: At the end of `get_curl_handle()` we call `set_curl_keepalive()` to enable TCP keepalive probes on our CURL handle. `set_curl_keepalive()` dates back to 47ce115370 (http: use curl's tcp keepalive if available, 2013-10-14), which conditionally compiled different variants of `set_curl_keepalive()` depending on what version of curl we were compiled with[^1]. As of f7c094060c (git-curl-compat: remove check for curl 7.25.0, 2024-10-23), we no longer conditionally compile `set_curl_keepalive()` since we no longer support pre-7.25.0 versions of curl. But the version of that function that we kept is really just a thin wrapper around setting the TCP_KEEPALIVE option, so there's no reason to keep it in its own function. Inline the definition of `set_curl_keepalive()` to within `get_curl_handle()` so that the setup of our CURL handle is self-contained. [1]: The details are spelled out in 47ce115370, but the gist is curl 7.25.0 and newer use CURLOPT_TCP_KEEPALIVE, older versions use CURLOPT_SOCKOPTFUNCTION with a custom callback, and older versions that predate even that option do nothing. Signed-off-by: Taylor Blau --- http.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/http.c b/http.c index 17b676a1d5..b4267bfdb0 100644 --- a/http.c +++ b/http.c @@ -704,10 +704,6 @@ static int has_proxy_cert_password(void) return 1; } -static void set_curl_keepalive(CURL *c) -{ - curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1); -} /* Return 1 if redactions have been made, 0 otherwise. */ static int redact_sensitive_header(struct strbuf *header, size_t offset) @@ -1242,7 +1238,7 @@ static CURL *get_curl_handle(void) } init_curl_proxy_auth(result); - set_curl_keepalive(result); + curl_easy_setopt(result, CURLOPT_TCP_KEEPALIVE, 1); return result; } From patchwork Wed Mar 19 22:23:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14023241 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E03D21CA07 for ; Wed, 19 Mar 2025 22:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423040; cv=none; b=PeOykgOHYLlRbf0t+yuCbDAtc6oUxDH2IB1G4U+7JH0S57ActsOAI6nY5ts31F1wmit8YtNNpVJsDsYtjFMtI/bJu2LDoFNtOZXYi+1Uv9Yd5DSwY4IR/XCtdOSGSzh4oDJk7SHIi3TTaDvz9V26KAEr4JOxTykRCweF5q/Xhgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742423040; c=relaxed/simple; bh=u8J/a6vtMrg6CW6vYKAQQwum9mFHago0MeMkTTKxE30=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=absTV/Hw6hwSSKOqtNRS1dcvl4MPIQEWHrrcSjIwV5WrESc24FpOOBN9Rf6X5fBLqMslIY9rbV4Fezvd97vYR1sm1vgiJvBinleeMNkS1bRKu41LAURpq8Oi6rgs9wlqqq9in6RSedFC+khfS8hLTpbBU3rFbksLyXNpFuY9R9w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=rGXOB6d+; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="rGXOB6d+" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7c3c4ff7d31so32747385a.1 for ; Wed, 19 Mar 2025 15:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742423038; x=1743027838; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=vU99CBhtEvFLXiRnbmZv+/YrKYqi5pLiWFjZDprO8F8=; b=rGXOB6d+6XL6jZB1poyBCKQgUlzh6oJxT4gZ943/GptfgTOJ3vh35nerxDenbKtR4f ALqfQtxDiUFHl4wvysuOHCoDTw+mHhImAjQl/z959ESnUqsunH740uywKr5oyEgXfqXw rFefXWPSFDmRCDxjrEQepvnRt1sgOrljJOu3Wq8Db9xgp/4OCN2jOO46vQIDnkBaqQ15 tXbwG/1mzU+JG3dCkefsNJwl7KX4fgFBwLPy3mGoNzgUydzQly4yxZdhY5b8jYSDlHQN UI83oy4kqhEZUIbr9Wi8f5E0lGH1tyuulO7o4S3WD//3DCrDuHbl/GaEoVkbYlqtB/Nq Xvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742423038; x=1743027838; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vU99CBhtEvFLXiRnbmZv+/YrKYqi5pLiWFjZDprO8F8=; b=RmHPqBGBj6bfHho0xyOcP8WtNtwc3mwgVLiKr5BhLw05pXYHW0wrd6SmYasiVSr8AJ vYVGoAZ6vlTSuK4sLry7Ijxv3yzT48hRQU2ALDVuYCuVd4CHp/rOI2jfgDwxFlGBds5T gN29NYdGqkkvo9E74oGrPSvZ6LMYDZ+HD0j0vTfiUY5/4aEZsI7qhtMT0aMym+AmL5br +wL8eCbe1f4ugOpzfozy5yuGQ/m71gsjGk2BWn00YfFrtPFU4j8j+LZWULTgUOHzFMjr 4RPPHq1xIjtKqC/msk9unPqlkpYoG5W0Yz8d1Ywl9kIWe74BXk52V4FP717LWvCinW94 yzJQ== X-Gm-Message-State: AOJu0YxjMwwyXyfPStC6GvTAL0tlrp+arymV8qw5mx3WpLzxajGVPgcA iSNXPdeTh/z1JCTlecSrNdddKH2kcVpZ7jdQd88YY5NplqITarOGvISU++4WHIHGFOvT2Z8m5s2 d2qc= X-Gm-Gg: ASbGncsXO5r+Ygk91Sm/czlY8HIuetmtyWO+2fFSXGkDd/4Owh6wfEe15HUc6k10223 1cwtT4GmJaZXQH7XXYkBlhqwLXq9IKcNLL3GCixM1nM6vQayL1ufeBMUzv0Ak83Q8Uhz1yF0EBy QR27hgKX3K+aL4u6RwujY5p1hhg1FQXFc+AhMN8hnzk2z5PSEQAzHJplA4Q/f4Z5KTgSgNIiAK0 +jlmtiXeQ9w4Tb05o+CmSnVjlhJ+hTTJv0PbD1Sn1YuyocBgI1J9V/NiGscm1wZzCgFTz/WhYki u4y0v1s8czE8XbReSWX5uRRfw+PE3dfCD7CvQhe4Bg67b2rYjUhGibiZVyAYk81cSzIptAUzoxr 7/zS0UBTGYaFWSGugsi4ehBUoVJ0= X-Google-Smtp-Source: AGHT+IFyu6Zi1xEgcxSDdM6N2MMG3laRpc8Bxz2ytei4DEbcMeNu4ecDtsm/mTDwcMWLfD9f2/n5Eg== X-Received: by 2002:a05:620a:17a0:b0:7c3:c111:8c3d with SMTP id af79cd13be357-7c5b0d37d1bmr174041585a.49.1742423037819; Wed, 19 Mar 2025 15:23:57 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-7c573d70004sm913866385a.83.2025.03.19.15.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 15:23:57 -0700 (PDT) Date: Wed, 19 Mar 2025 18:23:56 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Patrick Steinhardt Subject: [PATCH v2 4/4] http.c: allow custom TCP keepalive behavior via config Message-ID: <3fe62181e563d011d4a6374ed7894cc4ea807316.1742423021.git.me@ttaylorr.com> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: curl supports a few options to control when and how often it should instruct the OS to send TCP keepalives, like KEEPIDLE, KEEPINTVL, and KEEPCNT. Until this point, there hasn't been a way for users to change what values are used for these options, forcing them to rely on curl's defaults. But we do unconditionally enable TCP keepalives without giving users an ability to tweak any fine-grained parameters. Ordinarily this isn't a problem, particularly for users that have fast-enough connections, and/or are talking to a server that has generous or nonexistent thresholds for killing a connection it hasn't heard from in a while. But it can present a problem when one or both of those assumptions fail. For instance, I can reliably get an in-progress clone to be killed from the remote end when cloning from some forges while using trickle to limit my clone's bandwidth. For those users and others who wish to more finely tune the OS's keepalive behavior, expose configuration and environment variables which allow setting curl's KEEPIDLE, KEEPINTVL, and KEEPCNT options. Note that while KEEPIDLE and KEEPINTVL were added in curl 7.25.0, KEEPCNT was added much more recently in curl 8.9.0. Per f7c094060c (git-curl-compat: remove check for curl 7.25.0, 2024-10-23), both KEEPIDLE and KEEPINTVL are set unconditionally. But since we may be compiled with a curl that isn't as new as 8.9.0, only set KEEPCNT when we have CURLOPT_TCP_KEEPCNT to begin with. Signed-off-by: Taylor Blau --- Documentation/config/http.adoc | 18 ++++++++++++++++++ git-curl-compat.h | 7 +++++++ http.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc index 22a8803dea..67393282fa 100644 --- a/Documentation/config/http.adoc +++ b/Documentation/config/http.adoc @@ -296,6 +296,24 @@ http.lowSpeedLimit, http.lowSpeedTime:: Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables. +http.keepAliveIdle:: + Specifies how long in seconds to wait on an idle connection + before sending TCP keepalive probes (if supported by the OS). If + unset, curl's default value is used. Can be overridden by the + `GIT_HTTP_KEEPALIVE_IDLE` environment variable. + +http.keepAliveInterval:: + Specifies how long in seconds to wait between TCP keepalive + probes (if supported by the OS). If unset, curl's default value + is used. Can be overridden by the `GIT_HTTP_KEEPALIVE_INTERVAL` + environment variable. + +http.keepAliveCount:: + Specifies how many TCP keepalive probes to send before giving up + and terminating the connection (if supported by the OS). If + unset, curl's default value is used. Can be overridden by the + `GIT_HTTP_KEEPALIVE_COUNT` environment variable. + http.noEPSV:: A boolean which disables using of EPSV ftp command by curl. This can be helpful with some "poor" ftp servers which don't diff --git a/git-curl-compat.h b/git-curl-compat.h index 703756ba85..aa8eed7ed2 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -45,4 +45,11 @@ #define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1 #endif +/** + * CURLOPT_TCP_KEEPCNT was added in 8.9.0, released in July, 2024. + */ +#if LIBCURL_VERSION_NUM >= 0x080900 +#define GIT_CURL_HAVE_CURLOPT_TCP_KEEPCNT +#endif + #endif diff --git a/http.c b/http.c index b4267bfdb0..d21e3a3bad 100644 --- a/http.c +++ b/http.c @@ -104,6 +104,10 @@ static struct { }; #endif +static long curl_tcp_keepidle = -1; +static long curl_tcp_keepintvl = -1; +static long curl_tcp_keepcnt = -1; + enum proactive_auth { PROACTIVE_AUTH_NONE = 0, PROACTIVE_AUTH_IF_CREDENTIALS, @@ -557,6 +561,19 @@ static int http_options(const char *var, const char *value, return 0; } + if (!strcmp("http.keepaliveidle", var)) { + curl_tcp_keepidle = git_config_int(var, value, ctx->kvi); + return 0; + } + if (!strcmp("http.keepaliveinterval", var)) { + curl_tcp_keepintvl = git_config_int(var, value, ctx->kvi); + return 0; + } + if (!strcmp("http.keepalivecount", var)) { + curl_tcp_keepcnt = git_config_int(var, value, ctx->kvi); + return 0; + } + /* Fall back on the default ones */ return git_default_config(var, value, ctx, data); } @@ -704,7 +721,6 @@ static int has_proxy_cert_password(void) return 1; } - /* Return 1 if redactions have been made, 0 otherwise. */ static int redact_sensitive_header(struct strbuf *header, size_t offset) { @@ -1240,6 +1256,17 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_TCP_KEEPALIVE, 1); + if (curl_tcp_keepidle > -1) + curl_easy_setopt(result, CURLOPT_TCP_KEEPIDLE, + curl_tcp_keepidle); + if (curl_tcp_keepintvl > -1) + curl_easy_setopt(result, CURLOPT_TCP_KEEPINTVL, + curl_tcp_keepintvl); +#ifdef GIT_CURL_HAVE_CURLOPT_TCP_KEEPCNT + if (curl_tcp_keepcnt > -1) + curl_easy_setopt(result, CURLOPT_TCP_KEEPCNT, curl_tcp_keepcnt); +#endif + return result; } @@ -1382,6 +1409,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) ssl_cert_password_required = 1; } + set_long_from_env(&curl_tcp_keepidle, "GIT_TCP_KEEPIDLE"); + set_long_from_env(&curl_tcp_keepintvl, "GIT_TCP_KEEPINTVL"); + set_long_from_env(&curl_tcp_keepcnt, "GIT_TCP_KEEPCNT"); + curl_default = get_curl_handle(); }