From nobody Wed Feb 18 18:39:29 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 4fGQKG0Nq6z6ScNM for ; Wed, 18 Feb 2026 18:39:30 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGQKF5THnz3YMZ for ; Wed, 18 Feb 2026 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439969; 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=YG75XmxuqRh0Fx5l4+YKIuTi8GJmfgjVD1pNV7CTe4I=; b=MgKxhC5y2bdE7pYEA/wrjhhXPYB5NkWgPRmpc5rdJ0hSNvl8i3ud/uOrTevio24YUS15ZH L2qFUNqs8JxOiNDV+J3/Q25c6Z6R50dyZwq9pVSIYRIA0inDuP6TSGjsJ4BROdojrSZjSx Bhum74iHfeETh2nQ1N6EbDtNb5NWc2uia4W4bk1yeEzDTmVmQYVvaz5wkbsJZnK3iHAoww 2slK9e37aukVvTnwyH7dVRpF1NaPzIdlsWA2DXiz0gR/SirzNMgsm2+jUbHkE0dIzQ/y1R Rgm9s4vD63nuq4jlD3haIcQz6UFc+O25Fhg+XCE9xNk4GGfH37wLZul7AG6dIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439969; a=rsa-sha256; cv=none; b=n6VDMTCDEVKcozBjVDJ8BuUaXBXceeF4mYLHPzmT18C8pmY4XbYAXiQfhrRc07v2yoG10O wFC9inc2kc0Cedc1T2F406u7dLB7HglYWWReujUIr2SjeATeraLzePddLuRyL7x/ZPyne8 VVrcWlGU3hUIVgfRhH0iUQwqCJmoY5bgyMTtMgoGMuDXRNxMq2Stsjn7sPBXVUFR+2M4VM Mg3ZN5SGLBHSiSA3h8jpRjF7XMrfMt/8Sx7ZKKEkYchbS5tx4h/ypAQhOTk6UfNPRz3OQz Hz4KgIaxfhieoWY+Og7GyjvWzOFtOo4UqqMmuwyg0wfJSX7S0YqhMAhBIgJ4rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439969; 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=YG75XmxuqRh0Fx5l4+YKIuTi8GJmfgjVD1pNV7CTe4I=; b=khMk/8pn3Ye45EPBe+6wng+rYwBQtTf2XhYjE/4i0/DnuCOU+VL+IUqvPdm2bPV5FvGtRt Eu2+7yUFfP7H/2aKyD3X/jtzUCFs0BXd4wTk2HyIxCGMhGrMkOm+Qmz0FgnoIAp+mpxrKe E6xdWL4LX+7ejdv8/RVvZeEjPkr6OitFL+2D11E6ufgA42tm7Vl3QpaLbWjQvfoe4vLEZB EWKEy+WweQ8CvNTcOHkCuCJdqAWgqe9WFibYvoGkv/7bWMNWEmClqwVdKne9pGd/tFLMfV pHKeV3EiYAJQj0/6gP3PzTGGofhbNhiXtufLk8tlamCIZEEjSgIrg+9tY2mUDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQKF53RQz16FG for ; Wed, 18 Feb 2026 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4108d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:39:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d97c824f5b4c - stable/14 - libfetch: Restore timeout functionality 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d97c824f5b4c9e7e3a1400699022cba146e450fa Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:39:29 +0000 Message-Id: <69960761.4108d.113db3a6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d97c824f5b4c9e7e3a1400699022cba146e450fa commit d97c824f5b4c9e7e3a1400699022cba146e450fa Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:39:23 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) --- lib/libfetch/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index d5423d8eb5d1..bdc72f67c9a0 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -287,6 +287,9 @@ fetch_reopen(int sd) flags = fcntl(sd, F_GETFD); if (flags != -1 && (flags & FD_CLOEXEC) == 0) (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; @@ -1272,14 +1275,6 @@ 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) {