From nobody Wed Feb 18 15:11:16 2026 X-Original-To: dev-commits-src-main@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 4fGKj048h4z6SL28 for ; Wed, 18 Feb 2026 15:11:16 +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 4fGKj03X6qz3vwY for ; Wed, 18 Feb 2026 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427476; 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=QTfVkCVPIolVQ8oEWkNgodhyrM1/15JrKxiNX1lYpww=; b=lO7igNncDrYuBDjaEAEPC3PTfxiCxejt9AJ2IuAAhWbc9Dd/60Q/DCsS6fyQOxt9Ix1Pb3 he/9uDvw7V5svRq0Cd5e66y1UZMkm7ovW/64iz1YoCqKCs3d8ZUKmQ4l/+jUQV5ea1xD1v F8Uir2mNYvBrZu3XvkjalViYouAoIfXEF4IpXJ6Xv+EOsdjpBMkg3WTG1wB/8EH+7cP+0c UbjLocMI2K+wuQuBGd5unv/ZkLso4zrscf6Ta07shkR4v+vHT8KRm9OHSUreY63MwWNAZj g9drRw0IetcMWu36SlwCI7sSazjkLeGk2rMPnBLHCcC+rRS220Gaaes8sjp4jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427476; a=rsa-sha256; cv=none; b=Hs9b5qDVwseGdTUgcV1C0fZJW9WUpK37kij3SIOBsEttXJ2eMeZWueLyvfkO/sJkEQR97Q T4aIR+ironti23J4iTeVwrkEURYVoHVWy0zG66lV70u0hy+fP2ulcvHS4TMGxbXAUNI8k3 lLEAGgp4dfYtJw4S2/2ohsyCMw/OR+zyDaeF6YOCTsy7lM5jJV5Qg2RaAvy/W20/jp3K9k 0yZmsozffw8QsdYg0sVjsm53djKV3UX+MwL8j/tsba5MvWmLDKNviXwH9Cs3BwGJmeDzXF e242cU+7+D8ADt6UkUepq18ojzC87Xcn34iBJyGxmMzqqU7gbuhETR5NgIAxug== 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=1771427476; 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=QTfVkCVPIolVQ8oEWkNgodhyrM1/15JrKxiNX1lYpww=; b=buqRigWVO+nnN+sV/zEVB/0lzG1nJ4OAc2V9mNFYxBqt1eDA/lmCaxa7nGxjMESwrpzVkV 5RhUp0ZHlPv4hYHl66OoGZWLme90/yENjoLGK3acp5a6BLOi5p/KFCIW+NmZbN+nQ+VMh9 HKcUUUXGTvMcL9J2dZtVj1qWzznkFMAE1OdxZhfaQob0pdbukuKvV5Asv5ZJZgmGcbLTlo uArDv3Zx/8OUAcn1s5B5rvbaV/iB/oyO+oeDBhnH3JYULWDX+CwAW2fy4A3UGYSFRojOCv 1El4v/xNZ/nLHyVRpJ3NTnvkkt7uUTaJgpCoDuFpuEmN/LiNDEkl+3HRmOblCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKj031HLz11Y1 for ; Wed, 18 Feb 2026 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21875 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:11:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 73b82d1b0a2f - main - libfetch: Restore timeout functionality List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 73b82d1b0a2f09224e6d0f7a13dd73c66d740207 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:11:16 +0000 Message-Id: <6995d694.21875.4e33fc3d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=73b82d1b0a2f09224e6d0f7a13dd73c66d740207 commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 15:10:47 +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 --- 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 ec010909218b..75cb4320ad99 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -286,6 +286,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; @@ -1271,14 +1274,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) {