diff options
| author | Graham Barr <gbarr@pobox.com> | 2003-06-13 07:01:11 +0000 |
|---|---|---|
| committer | Graham Barr <gbarr@pobox.com> | 2003-06-13 07:01:11 +0000 |
| commit | e85b91f4ef1ea8b91be23d5814d9e629f7fd72f0 (patch) | |
| tree | 58241616307387ba5a1bbda8da3d730a94cc9e4a /lib/Net | |
| parent | 2868e2bb2b1cf521f022c2f26ac0adccd8f45749 (diff) | |
| download | perl-e85b91f4ef1ea8b91be23d5814d9e629f7fd72f0.tar.gz | |
Sync with libnet 1.15
p4raw-id: //depot/perl@19758
Diffstat (limited to 'lib/Net')
| -rw-r--r-- | lib/Net/ChangeLog.libnet | 17 | ||||
| -rw-r--r-- | lib/Net/FTP.pm | 10 |
2 files changed, 22 insertions, 5 deletions
diff --git a/lib/Net/ChangeLog.libnet b/lib/Net/ChangeLog.libnet index 259d623833..cf6e64dc13 100644 --- a/lib/Net/ChangeLog.libnet +++ b/lib/Net/ChangeLog.libnet @@ -1,3 +1,20 @@ +Change 818 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr) + + Net::FTP + - Fix merge error spotted by Slaven Rezic + +Change 817 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr) + + Set INSTALLDIRS to 'perl' for perl >= 5.008 + +Change 816 on 2003/06/13 by <gbarr@pobox.com> (Graham Barr) + + Add SIGNATURE + +Change 806 on 2003/06/02 by <gbarr@pobox.com> (Graham Barr) + + Release 1.14 + Change 805 on 2003/06/02 by <gbarr@pobox.com> (Graham Barr) Net::Cmd diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm index 19420a11a4..ce402b0461 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.69"; # $Id: //depot/libnet/Net/FTP.pm#75 $ +$VERSION = "2.70"; # $Id: //depot/libnet/Net/FTP.pm#76 $ @ISA = qw(Exporter Net::Cmd IO::Socket::INET); # Someday I will "use constant", when I am not bothered to much about @@ -392,6 +392,9 @@ sub type ${*$ftp}{'net_ftp_type'} = join(" ",$type,@_); + $oldval; +} + sub alloc { my $ftp = shift; @@ -409,9 +412,6 @@ sub alloc $oldval; } - $oldval; -} - sub abort { my $ftp = shift; @@ -1766,6 +1766,6 @@ under the same terms as Perl itself. =for html <hr> -I<$Id: //depot/libnet/Net/FTP.pm#75 $> +I<$Id: //depot/libnet/Net/FTP.pm#76 $> =cut |