From nobody Thu Feb 19 19:28:25 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 4fH3MF3X81z6SJtM for ; Thu, 19 Feb 2026 19:28:25 +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 4fH3MF2tMRz3ZPF for ; Thu, 19 Feb 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhpD20u0WtUZAUiB/WS+yqrs8ygJ4DZvr2TssR7FFbM=; b=aCFoEOeKXCvmbEx8detBg7MHMnX2wafS30P/Apz2TOpg7OLzmtEUvgyjz+eOCQLAUxuEUO VvkjeZVikCUIujCawpp56qwnCJ6ODAzajq7Iq8GLH3IQO2Cb9d9wccOGpp5V2Fnu9Hq0c3 rEjEhcDgtNg1RXvFCmhHsIrZb76dGcTN0CsBb/VBA1HrjLWuXKUBTLivujPyeURRVWACCV jFSHMbv9BBNQ4Ze0kCvK/h2tBj0jN70rsYih3MypJ3TlxGDXGZ/+sA4GRgah5Lo6W6IwAQ Nr2vKaJAr2Z0d7n1ygPdzd+4Z6+r0oIIBLGy9UTkENY3+pskXyLHQv0pALA17Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529305; a=rsa-sha256; cv=none; b=q9MnnaMFk73vvtAP5Xr6Tg/n8TVs//ZBRTixY56Ayf9Jpwltjm08zEd7cTk5N/FjFx8Ww3 sh23w4oyIsVz698T7Z+ZLh9/loXBaA/eBHtf409lioOFv3x+ZPuiN1/4UAQufV+C3InVqh lLKu8JgFnJlnrKQyiyOrllfZm0NwjCt1rmem/UkpTZYtVze2i/Zfs4nJ8Ka3mjGzfp3WzA xhP5J11HmQY7VEfMGPabTAJFx/nAK66obD1s8tpiQhcCplZsDZFDQ/HMXqq2Vz5ontbNr/ wthfhS/EZuQq6mZ/VFNUa5xHOqdU+kH9dg9rx6CDZk5+d+Gr9uinEKljQfopow== 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=1771529305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhpD20u0WtUZAUiB/WS+yqrs8ygJ4DZvr2TssR7FFbM=; b=XE+pAG/Sq3Vz9C/Q1g8Z0is2KulLx+ZkA8tyzM4Umdj4z6EyYehxGOGzG2hwN6hcioqws2 pIw1FzRWOrAcam3iDt1D/kHRiwAmfa1CM5ejZIR8lTyL702YayevDalJaqqMeqqBFkc8ok OLpEhtbnvPiuX32zBnZIO4FkO8mrkGufs6kLI+KsuofCdrQFNG9m4d8T2g6VNHTJBKlLzr 3KZgIeplCGpJsG3l21E9nxTMde9Xug1MBoTjncMrFA9MOX1XcqnvMyGTjf1w61imja/rpy iIJakD+96tEcQFCGvBygCtzGJgMzFh+xPgTBYSl7E0bccUw/bIx7/L3Vd4pd1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MF2BwWzwPh for ; Thu, 19 Feb 2026 19:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43737 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 8755b5f3a590 - releng/14.4 - libfetch: Restore timeout functionality 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 8755b5f3a590560996fb122abe22644d3be3836a Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:25 +0000 Message-Id: <69976459.43737.27f512c1@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8755b5f3a590560996fb122abe22644d3be3836a commit 8755b5f3a590560996fb122abe22644d3be3836a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:21:21 +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@) (cherry picked from commit d97c824f5b4c9e7e3a1400699022cba146e450fa) --- 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) {