From nobody Sun Jan 25 04:15:12 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 4dzJH4247xz6QBGq for ; Sun, 25 Jan 2026 04:15:12 +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 4dzJH41GDVz44vj for ; Sun, 25 Jan 2026 04:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314512; 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=lbT2DZ/NHNnV2utq0ZoLPtnWZTeEdLH5/lBrQT4r3zA=; b=G5CH7JQmDfQGwvVB+Wanbb4O5TuucB1EEjg6xVai814tabSQKGo4CfxQLTRI9S5clHRyBW +zLT1iFkDNi7cObIz/4O3DWUbX6Tqe/DNpG5QAQnZtCScMSgxylmMQipWRpIZXncFMy0mR VMm1DA7w984H2ew1T2xE5hcp9JpTX3onjUw3Zc5ylHujuRGuBpwIlT3Z5c+0z8ksEnbDsR /OJaPKB1nMeFbVvuk4HosgYvgm//mYPk50x5EYO4KxTc4WGiXov+JOZG5M3DLgoC7/g1+U 0R7PpXgs7Nl/rYPBEOpfHsfQTWdhKhDe+55WgLFwN91ESBGKKomBgAim9Gb2pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314512; 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=lbT2DZ/NHNnV2utq0ZoLPtnWZTeEdLH5/lBrQT4r3zA=; b=sBMfsf3FsPHjcKeJBlRS4Xfx8zrmm0uSet4N0P9pY3Ep7boW363jzD6YwWRU0MaEE1/0ZN 72OblHfXju7XSjNbfinafd9a11KyLMBGzIpvg2w9QeZ6vQ9tPv21YAFC/TBNTdv43UxeGO 7gQ0fargK5yaUIHKOJ+jki0NKbdJyaaeEQxFXQ3c+TFMu8UarxVj4jFyWlB7Kvm1XSx7kb 8iHnR6VzfM5prKC7WwxI+UX/APWkVBx5up/S8dPzHsjMo17ItmoT1NQoHkJoWa0oaEoavv FJyKo6y0V3QVDBtb9lpJ25lM+pbXuUwT+XMBy6gK31uPCDdGXCVdI7M8zc30PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314512; a=rsa-sha256; cv=none; b=U1iDoJAq9VkfnS1WHmqhZgBgndV5vQhUZmUF/Iry+2sAHIhthDpVFBGwaJoWET7Reqg9pi Bl7pYvVthV9VAIaRa5tZZDQk18bDvZaPinE0twx0XFNNphMTlkoU0opmgfFaYNcPA/B3pM xa6SFFmVXwMc3L/+MiSFGf5a6F9R2O9IW1JQMt9lMpC7TDizui84twUcm7XZmj5xFvkvML feNsEbshGlg88lEX2wCnwoMbJSQ8MZ0J/YD8VObpFy/11ag4GqM5fUZilKDrpkUAN4Umxv GorsgY9qbSeecimFjT/kMH8JSpG59qZ83VF5vVRNgJoSjwLfmIOyUC6BuHCc1Q== 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 4dzJH40pQ2z3j5 for ; Sun, 25 Jan 2026 04:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:15:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 2305dcc115e8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 2305dcc115e815b1b6b0259977afddb918f31a26 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:15:12 +0000 Message-Id: <697598d0.37d07.28da3c06@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=2305dcc115e815b1b6b0259977afddb918f31a26 commit 2305dcc115e815b1b6b0259977afddb918f31a26 Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:14:54 +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 69b507109bc4..e392c9e1e285 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1287,6 +1287,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) {