This fixes CVE-2021-32066.
Reported by Alexandr Savca in <https://hackerone.com/reports/1178562>.

This fixes CVE-2021-31810.
Reported by Alexandr Savca.

Co-authored-by: Shugo Maeda <shugo@ruby-lang.org>

	test/net/ftp/test_ftp.rb - fix intermittent MinGW failure

	Fixes intermittent error as below:

	[242/838] 5316=test_ftp
	#<Thread:0x0000020aa8733f20 D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2532 run> terminated with exception (report_on_exception is true):
	D:/a/ruby/ruby/src/tool/lib/minitest/unit.rb:199:in `assert': Expected #<Errno::ECONNRESET: An existing connection was forcibly closed by the remote host.> to be nil. (MiniTest::Assertion)
		from D:/a/ruby/ruby/src/tool/lib/test/unit/core_assertions.rb:504:in `assert'
		from D:/a/ruby/ruby/src/tool/lib/minitest/unit.rb:299:in `assert_nil'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:430:in `ensure in block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:431:in `block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2539:in `block in create_ftp_server'
	D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `write': An existing connection was forcibly closed by the remote host. (Errno::ECONNRESET)
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `print'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:426:in `block (2 levels) in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `each'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `each_with_index'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:420:in `block in test_list_read_timeout_exceeded'
		from D:/a/ruby/ruby/src/test/net/ftp/test_ftp.rb:2539:in `block in create_ftp_server'
	---
	 test/net/ftp/test_ftp.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	test/net/ftp/test_ftp.rb: remove unused variable

	---
	 test/net/ftp/test_ftp.rb | 1 -
	 1 file changed, 1 deletion(-)

	[ruby/net-ftp] Close the passive connection data socket if there is
	 an error setting up the transfer

	Previously, the connection leaked in this case.  This uses
	begin/ensure and checking for an error in the ensure block.

	An alternative approach would be to not even perform the
	connection until after the RETR (or other) command has been
	sent.  However, I'm not sure all FTP servers support that.
	The current behavior is:

	* Send (PASV/EPSV)
	* Connect to the host/port returned in 227/229 reply
	* Send (RETR/other command)

	Changing it to connect after the RETR could break things.
	FTP servers might expect that the client has already
	connected before sending the RETR.  The alternative
	approach is more likely to introduce backwards compatibility
	issues, compared to the begin/ensure approach taken here.

	Fixes Ruby Bug 17027

	https://github.com/ruby/net-ftp/commit/6e8535f076
	---
	 lib/net/ftp.rb           | 24 ++++++++++++++----------
	 test/net/ftp/test_ftp.rb | 39 +++++++++++++++++++++++++++++++++++++--
	 2 files changed, 51 insertions(+), 12 deletions(-)

	[ruby/net-ftp] Reduce resource cosumption of Net::FTP::TIME_PARSER

	Reported by Alexandr Savca as a DoS vulnerability, but Net::FTP is a
	client library and the impact of the issue is low, so I have decided
	to fix it as a normal issue.
	Based on patch by nobu.

	https://github.com/ruby/net-ftp/commit/a93af636f8
	---
	 lib/net/ftp.rb           |  5 +++--
	 test/net/ftp/test_ftp.rb | 11 +++++++++++
	 2 files changed, 14 insertions(+), 2 deletions(-)

	[ruby/net-ftp] Add test cases

	https://github.com/ruby/net-ftp/commit/865232bb2a
	---
	 test/net/ftp/test_ftp.rb | 6 ++++++
	 1 file changed, 6 insertions(+)

	test/net/ftp/test_ftp.rb: reduce the size of a long response

	"9" * 999999999 (about 1 GB) was too large for some CI servers.
	This commit changes the size to 999999 (about 1 MB).

	http://rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20210427T141707Z.fail.html.gz
	http://rubyci.s3.amazonaws.com/raspbian10-aarch64/ruby-master/log/20210427T145408Z.fail.html.gz
	---
	 test/net/ftp/test_ftp.rb | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)

* Otherwise those tests, etc cannot run on alternative Ruby implementations.