From nobody Mon Jun 29 15:54:20 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 4gprSF02TSz6jNqW for ; Mon, 29 Jun 2026 15:54:21 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprSD4ZV9z3QJQ for ; Mon, 29 Jun 2026 15:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748460; 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=VTn9wypfes0FV9xOhe9lfl3GBsh/5RFmPm7A8inLmK8=; b=mFTCPAFz8jHVTzXu5GKv5Smc14hNzQkoMvc7OrqF05ulhDe9HKXAp+9zWjQUjcyfNwzcst 1tOsn1+BFSvl8JPhGdaBqtQ8tH5C0q7j3Iz6WXkOq0byP7AHSI3n3oY5H996UyJStLPmqw npgAVizDWFZidep1dl3VQQr0KO/vcwxTBsOsfiYZqdxqxO3GurkeVSbujKZx4RqGuyGeua zQ/psr77R5q4SFyLePAowR+LnEsyweuStByt+SDItpG/h/JeC6j/h7GXoUjyFo86njjzlw rWnlpNtbtD7FbBrF2WjMzC3YD1vhqyzJs3bEEx0i+lSYkSmGuk6dUrGFLJU6CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748460; a=rsa-sha256; cv=none; b=sDr4EQEkx4QHPdqLp/2CfPoOkUihmoIC+gp2LGs5zAJ3/KanERU+fdRke9tIW14TItDdTh N0SjbaoC6O0FZntJhYz4aCiTa29bVRpYPRKeEVkbOmtFUjFY9Kl872QIZ4GO2mr/pgT7nX ompLEOrwMxIs8WDKqetNWqJbeixsdwfaGZTANwMTcUpT5BZCHRChRoXVdkE5JnxlNMx7dS w2MH+xf8nXWovZ2d7UmjfcCqPVSXowtivRyqQ3b8BW3KDm0XzM2B42DjuIQ62v/vysr80U aKkT00+E+wpQ1JKTy8E8/0ShJxTRGzAl/2Ukzqt4UjUZkkDqKB/cEeZ9xO4f0A== 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=1782748460; 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=VTn9wypfes0FV9xOhe9lfl3GBsh/5RFmPm7A8inLmK8=; b=J3sDo+n0mEbssJ9bw2K9zWgwBjC1SjCAlVBzor+bTdNEUYArY10HKDs4GvEfe4nRhHRrIq yQBGqLTwlJz1JeOdosnLub556qts+fV+PicsZbrKvWHOKm4NSSHfHjGChNRjFmM3dGkJBH TYn4DjaJXWTo48Xh9SvJBiIoIqdJv/S2muIuMlJQDm0TgB5CIhoni3Xt66EH995y9+L5+L woSTXONQgRo4XKQnggD5b53OLXrghQ7otV0/Sk0PipBlUzss7iPuZN1JuUmauowPFxnBwa RcJmZdGw+rJFPaHV0zZeUHHIYPA7v2lJHueDXkysCELWJHD462ajhQzd+rHI4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprSD3Tjxz146R for ; Mon, 29 Jun 2026 15:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3986b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:54:20 +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: 667ef98c29f9 - main - Revert "libfetch: Apply timeout to connection attempts" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 667ef98c29f94c34d06f5ff1d5d32c99a04f6082 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:54:20 +0000 Message-Id: <6a42952c.3986b.3e8adf59@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=667ef98c29f94c34d06f5ff1d5d32c99a04f6082 commit 667ef98c29f94c34d06f5ff1d5d32c99a04f6082 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-29 15:53:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 15:53:54 +0000 Revert "libfetch: Apply timeout to connection attempts" This reverts commit d53af4112273f7b234a1cdd6694b3a7ca0aae0eb. --- lib/libfetch/common.c | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index d1a897b98827..c1888a1518a0 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -593,13 +593,10 @@ fetch_socks5_getenv(char **host, int *port) conn_t * fetch_connect(const char *host, int port, int af, int verbose) { - struct timeval now, timeout, delta; - struct pollfd pfd; struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai; const char *bindaddr; conn_t *conn = NULL; int err = 0, sd = -1; - int deltams; char *sockshost; int socksport; @@ -657,47 +654,15 @@ fetch_connect(const char *host, int port, int af, int verbose) fetch_verbose("failed to bind to %s", bindaddr); goto syserr; } - /* make the socket non-blocking */ - (void)fcntl(sd, F_SETFL, O_NONBLOCK); - /* start the clock */ - if (fetchTimeout > 0) { - gettimeofday(&timeout, NULL); - timeout.tv_sec += fetchTimeout; - deltams = fetchTimeout * 1000; - } /* attempt to connect to server address */ - if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0) + while ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) < 0) { + if (errno == EINTR && fetchRestartCalls) + continue; break; - /* wait for connection */ - if (errno == EINPROGRESS) { - deltams = INFTIM; - pfd.fd = sd; - pfd.events = POLLOUT; - for (;;) { - /* wait for something to happen */ - if (poll(&pfd, 1, deltams) >= 0) - break; - if (errno == EINTR && !fetchRestartCalls) - break; - /* check the clock */ - if (fetchTimeout > 0) { - gettimeofday(&now, NULL); - if (!timercmp(&timeout, &now, >)) { - errno = ETIMEDOUT; - pfd.revents = POLLERR; - break; - } - timersub(&timeout, &now, &delta); - deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000; - } - } - if (pfd.revents == POLLOUT) { - /* connection established */ - err = 0; - break; - } } + /* success? */ + if (err == 0) + break; /* clean up before next attempt */ close(sd); sd = -1;