From nobody Thu Jan 22 08:42:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxZLy4VGKz6PXJf for ; Thu, 22 Jan 2026 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxZLy3rhmz3VR8 for ; Thu, 22 Jan 2026 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769071354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ2FxNPveIrd7XBNweWzECnMNFn4AM1duPZz6Ac9aFg=; b=aq7zK59SEl2Q+YMLYQA92sJdNgeaPl2Ew8VzKtOmj2u8BZLmkDDQT739hZNwdYKBttFUrS Qge+Cnc3JBcdopo/vMrBZdZUd3OZkC1hZXCJSyj84lb6SEba+SpO4WxeAufYgNdnqSd0RA fBlMvo+D1X41ANMshv8ZacP4Y0MNwD3eDKdAVdvKsnESeIRMGKk/pBpKBYEZJsvPqI4DPZ e93Gp9NJHV3RoIAVM0aEf2vRlh8IsI/IFR3xhrz7CYo64gU1Ee5hc06RisEWrvlNa3Pq5g rlN3n3v7hwQAia1X5IClmTqxMM4aPaxil79Emr+GsW4j9eijEA4r5apBocigtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769071354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ2FxNPveIrd7XBNweWzECnMNFn4AM1duPZz6Ac9aFg=; b=c3IXHUfStI1tLKd0CcXloJXeFwqI0Ej7as6PXNPxEZDC73pLkR9Ho0gSBK+Jv5S2RcQi0M 1ZUY3ozIJbH2EDUcWE7I/BiFkbh9Qa8rsJTU3c+TJa+mFnWk/fs2NsIjk+D2UpItaeOAlx vzNDapDqfKMfLfQLUHkBbeJQGNPduD0+9Z4ig+gIhBTehh+0RpT/pTq3PmLdhcOq0MOk8E IH1GuftltaZYLwG/ciQwjNbs9k2RoZPxgJRP/1/cvVKC+xjNpnNz0pD2KXanzxbNAzy0bF Jj8s7Fxhhx+RrnoSCSlZcVWMQIguJFQ0YSMY2wk2ykqjxbVZypSi64keBP7ACw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769071354; a=rsa-sha256; cv=none; b=WLjLYWsbvrUXJcTS9jkdZaGMtQl96+iag73fdTfnxoq53hWuZ13ORTsmNtI1pkJ+dAMhz8 0UKbvInX6a0BqVvdc0i1Rs/0Jrqm92RkMDIzFGQ5SeqIN/YybZqxRJPJCnp86iCK2lBPqs biPb040LhfedP8Dpu4LGosFMMEnswK8lVf80zOJw5MnUporiLRpy8F7yVjWRzIi3o4FmQR BWqGRHYxiPMFv0zfZeENb/uM/GvMcu5LF4HaytZanpMNTfdUZBr7H021aRSFB8CmwwWVov MlBcUoe2e9Kj3PQaL9REXaAEVkqLpIC4IHi4AC0WeY9e18EZCMqrAoSNcNgkCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxZLy3BxMz9yj for ; Thu, 22 Jan 2026 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d8f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 08:42:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 8f8a7f6fffd7 - main - libfetch: apply timeout to SSL_read() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 08:42:34 +0000 Message-Id: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-22 08:40:35 +0000 libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). MFC after: 3 days --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 2e1364edff04..a9935ef176da 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1265,6 +1265,14 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; + struct timeval tv; + + if (fetchTimeout > 0) { + tv.tv_sec = fetchTimeout; + tv.tv_usec = 0; + setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, + &tv, sizeof(tv)); + } rlen = SSL_read(ssl, buf, len); if (rlen < 0) {