diff options
| author | Graham Barr <gbarr@pobox.com> | 2003-06-18 16:41:31 +0000 |
|---|---|---|
| committer | Graham Barr <gbarr@pobox.com> | 2003-06-18 16:41:31 +0000 |
| commit | 511d7d53b733d6c97ea4e94a7969fd306373ab38 (patch) | |
| tree | c48ce323b134a109a076ade0ddf36758c1fdf38e /lib/Net | |
| parent | b5ab1f6f2e57e1281ebcae37bccb0e45c4bca11d (diff) | |
| download | perl-511d7d53b733d6c97ea4e94a7969fd306373ab38.tar.gz | |
Sync with libnet 1.16
p4raw-id: //depot/perl@19812
Diffstat (limited to 'lib/Net')
| -rw-r--r-- | lib/Net/ChangeLog.libnet | 9 | ||||
| -rw-r--r-- | lib/Net/FTP.pm | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/Net/ChangeLog.libnet b/lib/Net/ChangeLog.libnet index cf6e64dc13..057db8eafd 100644 --- a/lib/Net/ChangeLog.libnet +++ b/lib/Net/ChangeLog.libnet @@ -1,3 +1,12 @@ +Change 820 on 2003/06/17 by <gbarr@pobox.com> (Graham Barr) + + Net::FTP + - Fix uninit warning when sending the ALLO command inside put + +Change 819 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr) + + Release 1.15 + Change 818 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr) Net::FTP diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm index ce402b0461..aac963b827 100644 --- a/lib/Net/FTP.pm +++ b/lib/Net/FTP.pm @@ -22,7 +22,7 @@ use Net::Config; use Fcntl qw(O_WRONLY O_RDONLY O_APPEND O_CREAT O_TRUNC); # use AutoLoader qw(AUTOLOAD); -$VERSION = "2.70"; # $Id: //depot/libnet/Net/FTP.pm#76 $ +$VERSION = "2.71"; # $Id: //depot/libnet/Net/FTP.pm#78 $ @ISA = qw(Exporter Net::Cmd IO::Socket::INET); # Someday I will "use constant", when I am not bothered to much about @@ -713,7 +713,8 @@ sub _store_cmd # _store_cmd call, figure out if the local file is a regular file(not # a pipe, or device) and if so get the file size from stat, and send # an ALLO command before sending the STOR, STOU, or APPE command. - $ftp->_ALLO(-s _) if -f $loc; # no ALLO if sending data from a pipe + my $size = -f $local && -s _; # no ALLO if sending data from a pipe + $ftp->_ALLO($size) if $size; } croak("Bad remote filename '$remote'\n") if $remote =~ /[\r\n]/s; @@ -1766,6 +1767,6 @@ under the same terms as Perl itself. =for html <hr> -I<$Id: //depot/libnet/Net/FTP.pm#76 $> +I<$Id: //depot/libnet/Net/FTP.pm#78 $> =cut |