diff options
author | Graham Barr <gbarr@pobox.com> | 2003-06-13 09:02:58 +0000 |
---|---|---|
committer | Graham Barr <gbarr@pobox.com> | 2003-06-13 09:02:58 +0000 |
commit | 4be8c4ed894a41c95567dcc716f76951d1095d25 (patch) | |
tree | 67bc2df373ebc83d167b0baf87bae6cee20b97c3 | |
parent | d0c9131d23aa327340cae09239dcf7b0adcc7279 (diff) | |
download | perl-libnet-4be8c4ed894a41c95567dcc716f76951d1095d25.tar.gz |
Net::FTP
- Fix merge error spotted by Slaven Rezic
-rw-r--r-- | Net/FTP.pm | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |