From nobody Wed Feb 18 18:41:46 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 4fGQMt6Bjcz6ScR8 for ; Wed, 18 Feb 2026 18:41:46 +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 4fGQMt5jPRz3Zbv for ; Wed, 18 Feb 2026 18:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440106; 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=dDD7Y7h92PB5sOXOQbj6unV80thH+WChcxf75z853q0=; b=njbGOeYnlUvvfR9QkD0/eUROElMhm8KxpYSXbhM+xb94E6mbtmFJrlu4XAa7AgkwoDHOF0 JmYMSPXGH0EbIndxE7BQiaxlHsIDwhM7WRlq/78hYjrfmxDs6BVRyolAn2emMimIhq2BCI fzVfW14EWRG0MN4SkkFsONV63wkUaEWwrqx/x17iwsee629obKwMW8/UIPgFAXzSrUdOqF u/aPyPqp9NWl0huMKQRZh4zBzhTQh1FLcm8Eb/gfZk9o1FtsCN8hpcGbwXhVBylqykYjKx Rsz5T2ubv5wHMjYNTJiugFDxiybk40EMJoP7jRw6JZEKu+R9DleRZGjVNh0Wvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440106; a=rsa-sha256; cv=none; b=DCsVaoVvMjGY0izO94QoEyHn8XRcsB3KmyHGyK/+rb70RikczI+bABUijpJI6GJOuIBTyS 2OA/Ls+Iq2cquI+c78l17+cknU4GxRKHNIgD/b3o5u43mB3uxjsyka+3Ve8z9kUfOCul1N fgpPP1ZxkeLHh+MvMr2uXfcBqmkFpQDt07iB/2TlCJf7SeoCOfdCttRUaxj4e5VlaP5mXx 7pUEOWaX1ZZS5K9vfXkzkatjwgb4h0zprVis7QXTAMJavTSxUINf4NTFSzI96jaC3jYtWz UZqYTvAoc/QdkKNmIo2ESH4DD5BaZW8EI1Ueg3p/baUN3Qmypq7tX63hJgWuWw== 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=1771440106; 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=dDD7Y7h92PB5sOXOQbj6unV80thH+WChcxf75z853q0=; b=WLChyHhC9OQd3zsFBiaF9jG1pdbxzdPJ5yBjVHxYHHM1kboawIwry/5FD/HYH8xkzLnqsd cac+yP0LwYuBV0ampHxcD7LXfcHiClLTxf1EYAsqLpNa9z3hbCZ9zbt2s1Azg4U6XA+MCV B+6xHQitt2Jv1/RGUPQusz5kbk/YI1/EXJ5mlbvlimpdrR0xUo9bhADu4HQ0E1witIwUWS hJoUm9sB9FrGnltjRVhTrdQNLTeX3qED+Meh5mu90NxD5MJR1+gUNGW1I7JAawFsw5pc3z B4mtaRpuP/gmPAq4fLfXLI0zuNSvxED7ZcjWkP6DTDd7mlLJQVhNR2Rs+WZXMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQMt5Jzpz16jr for ; Wed, 18 Feb 2026 18:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 424a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:41:46 +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: 589cef5d5151 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 589cef5d51512782cee8b4562a62e70c654a7427 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:41:46 +0000 Message-Id: <699607ea.424a5.6b0e98a6@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=589cef5d51512782cee8b4562a62e70c654a7427 commit 589cef5d51512782cee8b4562a62e70c654a7427 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:41:17 +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 | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index ca5022df38b4..008185720f16 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -278,13 +278,18 @@ conn_t * fetch_reopen(int sd) { conn_t *conn; - int opt = 1; + int flags, opt = 1; /* allocate and fill connection structure */ if ((conn = calloc(1, sizeof(*conn))) == NULL) return (NULL); - fcntl(sd, F_SETFD, FD_CLOEXEC); - setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof opt); + 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; return (conn); @@ -1269,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) {