From nobody Sun Jan 25 04:11:43 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 4dzJC36LyTz6QBB6 for ; Sun, 25 Jan 2026 04:11:43 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJC33Wn4z43Z3 for ; Sun, 25 Jan 2026 04:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314303; 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=2Hr944tMoRpwxIbmbUDpQRf/dzdBRCnQ7X85IJV4kDw=; b=TGP1HbTa4Puke3tJKVGUiq7eZ2tIPAruia/FSKBnek+zIKfL3Jux8AMRqdpzXr9QMA59YT KTBMrQUgxUVBr+Bk02yF3SZT1f1TnnRWOlNQvx5aRmyv3X0ze9W7STEp7HeLpb8IklgMVJ ctPzv4uOdhRPkJch8jleMZbvEWhMsokefA+3FFT8IUH90BSJWax8bs5LKPWgfrOicBEZ6W Y1PVO7uqb07eR9TlEbfbiyCGe+rmLutmLkwR8zPAUJgJ++4D15GGrgpS+gCKe49KGA4CeG BiZJX+AYdutyZ1dBMd3AZHIp0Dk2qs74FMA8Zx+F2shC7dRYj6mLs9ImlxH82w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314303; 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=2Hr944tMoRpwxIbmbUDpQRf/dzdBRCnQ7X85IJV4kDw=; b=Iiuev2Z0HHkjaL3wbxN0NTsHu0wc6lkjgOOeQoQ5cCTzeD7ILSerT8zid4fjtpIuUULadC GXSuzqo4oYHJMMFAizfoDD0zbiRNO1/ZZ3tHOmpcdZNT+gBZe9I9L7WajcndlKPNeczxaf BJkEErZLYiJoTkTqn6rqLCRxEDExEN99QmSE9aeGQPKIyORHDTSWGTvB3CW2I0NRZDO0GK /44fxfeDaCOe8i03/Z0IJNnPSC7IXgSxG8axF66B4W9QaIY2uhbnbIHMrE8TNgG4UzwzoT DMgGDL9JFlT9srcGJfCVeIp4lgMs6sz7evL9iVtr4uxsEdOtTlKfLCTDfZuNuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314303; a=rsa-sha256; cv=none; b=yjuIROnaInDv1sdJfOWnVnWP/xQUVDIYktZfrRnAkLqIaS/3KTU4nqoIJxj4ZlHUVzTPJ1 smpK5bRcPZgGuHttghDByxj0nTxtD6DwaeOFsqBWyoqnpBvE4nmhgKYCJr0ShQjoaMSNWf 6b54Chi4OR3WJeI5ofeeXf6UUd43rYWk0IuyN/sknf4QpBKxqAaFMxglevweQTDSEg+pKM pcVH3tPmeh6gWiPJd6Ea6tpdBrdjG8zYTtNJJN7rUhJlaGqoly9ec+ow0r0vDEh3I/gbB7 LdTD8wfc1iBol8AkZgsoCN8Y4FL3i4Pvb4NIR9NTYSpLDxKlzkc+JudrwMadfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJC337g2z3kx for ; Sun, 25 Jan 2026 04:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 8ec56236eddf - stable/15 - MFC: libfetch: apply timeout to SSL_read() 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8ec56236eddfc586c5d9338134c20909b3064c6a Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:11:43 +0000 Message-Id: <697597ff.37527.4d7a3efd@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec56236eddfc586c5d9338134c20909b3064c6a commit 8ec56236eddfc586c5d9338134c20909b3064c6a Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:11:25 +0000 MFC: libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 786d5647d993..9df0e9abeba8 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1265,6 +1265,14 @@ 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) {