From nobody Sun Jan 25 04:13:28 2026 X-Original-To: dev-commits-src-branches@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 4dzJF51G81z6QBTC for ; Sun, 25 Jan 2026 04:13:29 +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 4dzJF50JWrz4449 for ; Sun, 25 Jan 2026 04:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314409; 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=Swlk+Syf41KQR9NLah7RNC8ud+7sqGSRyekZUa8Rwzo=; b=qoBk44phsx2ISxjvvsxC6nO9XfDBhocmhO4TDkCsGCBiAQrpSr1dLTo+Jdb3K6OklDUk7k i0EEpfAbvvx8qeqZGTdLlFTg8kysKn3UOnTB1JmZkazbm0lDPCxxFkOGRv/jiu8lP7tETH cgCIHqiBYKuK7GMe+nC7VDhzLUNLZIo1oul3pHfb8IdjpRcJ39TLl/HmcAbFimnfpIZHpy WEcNfQqDB8xJfA2ItnWhuuR5q0PsEJKgYC9igdl4+5ENsmhPpSxW5LfGi+crXX5BirrqSN m0c5Qjrad96KCRzJ9KfFJTeNX9B+oupXRQRU6CxY2ursyuqT4aHCVBuuRLAwSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314409; 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=Swlk+Syf41KQR9NLah7RNC8ud+7sqGSRyekZUa8Rwzo=; b=TvQIQA4umN97FuVzaCeXS2tkXe7gISK6nDd+m3MgeoJC3OYaj7e+qQm0rUmEb3bofrKScI 2XJGSUAnkkGmwqG9h2hQ5md7zkIH9XhlJc0oTw585UjMWQPO7d6cdGU0YNW8R5RELhWsyE dcAWUUa8xanEVc+LAprRm6t/3emPGqppXBFEDLnnwgNenFzNkXUNUnynAAAdsNZA3J2xHO REgA+Ka2+HNd1zbl1eCz8xZ66olB17ZTnQOdm0FEQQXnWkSY14QTzthZqSvKjXZ3eVTv8g j4jxIHX2P4rbDOk69IYiHSzqC/st/epRbk2QSbTh1r+n6yb/8KL0bfph6C9f/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314409; a=rsa-sha256; cv=none; b=gHlLF0DZobWZj6/Ogt8BgYaa2QykV+wEkoEPEiiHcJMXLc+cumpuobD4VKvhwqEHtBOkxZ oZQAKjE8tF5t7mXa1pi+k5ImEEHhW6ONDDMv8/PJo37ENKuKurf1nx73nFIFzrUYTisDcg hYfmywAlF5qbClSRIzTyrf7HmO4tp92dUMM4KpwtYZQTZxS4oTpkmXQf2CwAI+CLU5p0WZ dGYeOqXBtBV6gDV7eg/jvj3c5O51FX5BnbwOiywBZZCshShmLgTdtysw/PNJRHhjg4Xddg hAgfZg6c+VXnIhIKQ5ber9B4uEMfFypbIjMVmI90CV06DUZI6BWmYiAEqvHO9g== 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 4dzJF471TJz3nq for ; Sun, 25 Jan 2026 04:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:13:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: fae1c84e95f7 - stable/14 - MFC: libfetch: apply timeout to SSL_read() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: fae1c84e95f7be4deacdab8a97f140714d8d2ae8 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:13:28 +0000 Message-Id: <69759868.37d03.60f06fa7@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=fae1c84e95f7be4deacdab8a97f140714d8d2ae8 commit fae1c84e95f7be4deacdab8a97f140714d8d2ae8 Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:13:02 +0000 MFC: 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(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 22779876ded4..9721cc557b53 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1266,6 +1266,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) {