From nobody Wed Feb 18 18:39: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 4fGQJx3n2tz6ScCN for ; Wed, 18 Feb 2026 18:39:13 +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 4fGQJx1wKxz3Xqv for ; Wed, 18 Feb 2026 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439953; 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=CqjFNeUjJAYSHcBmgSlAr0IYHhGjkkuUkIJC8UzDnaQ=; b=uUBpjiNfZ58SxxIy9ENKOCbl0Xy9osnTxctS+LYMucwOa73j5KeaFhpFF7//qjE9NpGlE1 ptIoLcpfVZNkcT1+T8/qLXCg+4hOjWUgYTYYnt8naw8yS4tDSo6CAqvDOd6rB7xQIyF2wD n92U6c/r0hfn91FpPiJJoN2U7ECguPH6/zdWdNJDTPZysrlLzuKDiEQWozpV313ZlFx2vf HCFLTP/gi0pTOnlC8nGa5LSNWJ9kRK/D3XKKA/aMTqvZAV0a8tlgyXBYwloou9DNKU/2tF K3oERTUWpR/jrYnqNPVfadfVaB5uygB8LPvxruTWz2eqm4OOM/JoVtb5aigIyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439953; a=rsa-sha256; cv=none; b=uHdsniK3kfxsTcR4oAlLwXGgHKpGuBYmPu5Z2CcZ+tSU8E5HX1YmKOXZpsNtzlH0wZRJPQ V4oxBuxC6FPj+mrpP0Ir8Y26YT7e3kxjEGtZXaVOwWVmqF4O59qBdz1ntXmmbwHUM72ILV UC6ztqHjs7GfexOsOfSXOorbIIcU9s6cIc/sSp4Bqhn07rDCxgC+/EtaWNRF84Mx+jvRdd NFL82ragTb317+xR/e8T/QLEZpa1RBVN12kF5AEpEhLJoWRVUbhPa2kYJqKdH+29OZaU3O 3tiqvVMYdM7m+oTi+Zl3aoUW3DItH9OS5uU2YPPm6FRraaZWSy1CmKEKCns6cw== 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=1771439953; 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=CqjFNeUjJAYSHcBmgSlAr0IYHhGjkkuUkIJC8UzDnaQ=; b=Kj32b2XEHP/LWq9q0vJjHTM4s3qtVZldkzKKp1MB23Dy2k+Bbr6td1kYfBSdnXtFtnsoEv 7GYAftIfvGPva72f+Rr2yHz25lt31r41/lq3IsxtXDxm9CVaOw64ubESdD+F9R/TonCVU3 AlXbmM/ewQ7E9q8QP3Bm8JbHVNX18jNGpysixNT+idKgJcIJSzII/3ykwvmO32zl2kSx05 016ZKeqKqzYGRfNf+E3Nrrmc5fRfiBJ/tXePsh0tpqApxaIiLWCp9vx2tiIiU/95NmDtW2 zQEqO8T1UE8/Dw389Hr4gx6RfpbBtek7az/UjS+IC73nMER5pFznfY5Pw9DVZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQJx0Z6jz16VN for ; Wed, 18 Feb 2026 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41089 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:39:12 +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: ae12f0f08e02 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:39:12 +0000 Message-Id: <69960750.41089.1d3e6b43@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 commit ae12f0f08e02804f5f2e70a0558c39a2cb4c5b23 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:38:48 +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 584973476068..f679b2afc95c 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) {