From 94806970680d8f6dbb62a3ddb128aa8f5f9a6e15 Mon Sep 17 00:00:00 2001
From: Graham Barr <gbarr@pobox.com>
Date: Fri, 7 Sep 2018 16:37:02 +0200
Subject: [PATCH] Catch timeout condition while doing an abort
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Petr Pisar: Ported to perl-5.16.3.

CPAN RT#18504

Signed-off-by: Petr Písař <ppisar@redhat.com>
---
 cpan/libnet/Net/FTP/dataconn.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpan/libnet/Net/FTP/dataconn.pm b/cpan/libnet/Net/FTP/dataconn.pm
index e7645cb..bc6ba7f 100644
--- a/cpan/libnet/Net/FTP/dataconn.pm
+++ b/cpan/libnet/Net/FTP/dataconn.pm
@@ -63,7 +63,7 @@ sub close {
 
   if (exists ${*$data}{'net_ftp_bytesread'} && !${*$data}{'net_ftp_eof'}) {
     my $junk;
-    $data->read($junk, 1, 0);
+    eval { local($SIG{__DIE__}); $data->read($junk, 1, 0) };
     return $data->abort unless ${*$data}{'net_ftp_eof'};
   }
 
-- 
2.14.4