about summary refs log tree commit
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2014-01-30 09:58:24 -0800
committerSteve Hay <steve.m.hay@googlemail.com>2014-01-30 09:58:24 -0800
commit620ed1fc866758eff4e86c856f026b3bbeda08a0 (patch)
tree32daa839a96ab629876cfea458d1502a7ab42ae9
parent2c6a5afd1ef525c30ad32427f4dd20bc6e819403 (diff)
parent521c6e738cd6418bae7ab91322deb8b5259de821 (diff)
downloadperl-libnet-620ed1fc866758eff4e86c856f026b3bbeda08a0.tar.gz
Merge pull request #1 from olegwtf/master
timeout for dataconnection creation
-rw-r--r--Net/FTP.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/Net/FTP.pm b/Net/FTP.pm
index 01e3649..83e5f3d 100644
--- a/Net/FTP.pm
+++ b/Net/FTP.pm
@@ -943,7 +943,8 @@ sub _dataconn {
       PeerAddr  => join(".", @port[0 .. 3]),
       PeerPort  => $port[4] * 256 + $port[5],
       LocalAddr => ${*$ftp}{'net_ftp_localaddr'},
-      Proto     => 'tcp'
+      Proto     => 'tcp',
+      Timeout   => $ftp->timeout
     );
   }
   elsif (defined ${*$ftp}{'net_ftp_listen'}) {