From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D049315A7D9 for ; Wed, 22 Mar 2023 16:29:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11F97E07A9; Wed, 22 Mar 2023 16:29:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8B81E07A9 for ; Wed, 22 Mar 2023 16:29:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCDDE340831 for ; Wed, 22 Mar 2023 16:29:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 711958DA for ; Wed, 22 Mar 2023 16:29:41 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1679501595.fbfd5e0969fa94b51c4f73f13bf0f6d6e56e7440.robbat2@gentoo> Subject: [gentoo-commits] proj/gentoo-mirrorstats:master commit in: / X-VCS-Repository: proj/gentoo-mirrorstats X-VCS-Files: probe-mirmon X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fbfd5e0969fa94b51c4f73f13bf0f6d6e56e7440 X-VCS-Branch: master Date: Wed, 22 Mar 2023 16:29:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed21147a-fc85-41fa-a199-c5dd62cfb7fe X-Archives-Hash: 8d8c1f693cd5a6ea5b215fabeb2236af commit: fbfd5e0969fa94b51c4f73f13bf0f6d6e56e7440 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Mar 22 16:13:15 2023 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Mar 22 16:13:15 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=fbfd5e09 probe-mirmon: workaround: back to wget for FTP Signed-off-by: Robin H. Johnson gentoo.org> probe-mirmon | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/probe-mirmon b/probe-mirmon index ff73776..a40be16 100755 --- a/probe-mirmon +++ b/probe-mirmon @@ -29,6 +29,11 @@ sub main { if ( $url =~ m,^rsync://, ) { handle_rsync( $timeout, $url ); } + elsif ( $url =~ m,^ftp://, ) { + # Hacky, at some point CURL stopped returning the output here; just go back to wget for now. + #handle_libcurl( $timeout, $url ); + handle_wget( $timeout, $url ); + } else { handle_libcurl( $timeout, $url ); } @@ -44,6 +49,7 @@ sub handle_libcurl { $curl->setopt(CURLOPT_TIMEOUT, $timeout); $curl->setopt(CURLOPT_FTP_USE_EPSV, 1); $curl->setopt(CURLOPT_URL, $url); + $curl->setopt(CURLOPT_VERBOSE, 1) if $url =~ m,^ftp://,; # A filehandle, reference to a scalar or reference to a typeglob can be used here. my $response_body;