Date: Sun, 25 Jan 2026 04:11:43 +0000 From: Eugene Grosbein <eugen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8ec56236eddf - stable/15 - MFC: libfetch: apply timeout to SSL_read() Message-ID: <697597ff.37527.4d7a3efd@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec56236eddfc586c5d9338134c20909b3064c6a commit 8ec56236eddfc586c5d9338134c20909b3064c6a Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> 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) {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697597ff.37527.4d7a3efd>