diff options
| -rw-r--r-- | Changes | 6 | ||||
| -rw-r--r-- | Makefile.PL | 2 | ||||
| -rw-r--r-- | Net/Config.pm | 18 | ||||
| -rw-r--r-- | Net/Domain.pm | 4 | ||||
| -rw-r--r-- | Net/FTP/A.pm | 6 |
5 files changed, 21 insertions, 15 deletions
@@ -1,3 +1,9 @@ +libnet 1.24 -- Mon Jan 06 2014 + + * Fix incorrect handling of CRLF in Net::FTP [Willem Monsuwé; resolves CPAN + RT#41642/62029] + * POD fixes [Dominic Hargreaves; resolves CPAN RT#91761] + libnet 1.23 -- Mon Aug 12 2013 * Typo fixes [David Steinbrunner; resolves CPAN RT#87681] diff --git a/Makefile.PL b/Makefile.PL index bfe17a3..a39c71b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -4,7 +4,7 @@ $NAME = 'Net'; $DISTNAME = "libnet"; -$VERSION = "1.23"; +$VERSION = "1.24"; BEGIN { require 5.002 } diff --git a/Net/Config.pm b/Net/Config.pm index 885d9cb..ba16332 100644 --- a/Net/Config.pm +++ b/Net/Config.pm @@ -13,7 +13,7 @@ use strict; @EXPORT = qw(%NetConfig); @ISA = qw(Net::LocalCfg Exporter); -$VERSION = "1.12"; +$VERSION = "1.13"; eval { local $SIG{__DIE__}; require Net::LocalCfg }; @@ -213,23 +213,23 @@ sequence of commands that Net::FTP will use =over 4 -=item 0 +=item 0Z<> There is no firewall -=item 1 +=item 1Z<> USER user@remote.host PASS pass -=item 2 +=item 2Z<> USER fwuser PASS fwpass USER user@remote.host PASS pass -=item 3 +=item 3Z<> USER fwuser PASS fwpass @@ -237,7 +237,7 @@ There is no firewall USER user PASS pass -=item 4 +=item 4Z<> USER fwuser PASS fwpass @@ -245,19 +245,19 @@ There is no firewall USER user PASS pass -=item 5 +=item 5Z<> USER user@fwuser@remote.site PASS pass@fwpass -=item 6 +=item 6Z<> USER fwuser@remote.site PASS fwpass USER user PASS pass -=item 7 +=item 7Z<> USER user@remote.host PASS pass diff --git a/Net/Domain.pm b/Net/Domain.pm index d47f8be..5b964c3 100644 --- a/Net/Domain.pm +++ b/Net/Domain.pm @@ -16,7 +16,7 @@ use Net::Config; @ISA = qw(Exporter); @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname); -$VERSION = "2.22"; +$VERSION = "2.23"; my ($host, $domain, $fqdn) = (undef, undef, undef); @@ -169,7 +169,7 @@ sub _hostdomain { } chop($dom = `domainname 2>/dev/null`) - unless (defined $dom || $^O =~ /^(?:cygwin|MSWin32)/); + unless (defined $dom || $^O =~ /^(?:cygwin|MSWin32|android)/); if (defined $dom) { my @h = (); diff --git a/Net/FTP/A.pm b/Net/FTP/A.pm index 427d02b..c117d69 100644 --- a/Net/FTP/A.pm +++ b/Net/FTP/A.pm @@ -10,7 +10,7 @@ use Carp; require Net::FTP::dataconn; @ISA = qw(Net::FTP::dataconn); -$VERSION = "1.18"; +$VERSION = "1.19"; sub read { @@ -77,8 +77,8 @@ sub write { my $timeout = @_ ? shift: $data->timeout; my $nr = (my $tmp = substr($buf, 0, $size)) =~ tr/\r\n/\015\012/; - $tmp =~ s/([^\015])\012/$1\015\012/sg if $nr; - $tmp =~ s/^\012/\015\012/ unless ${*$data}{'net_ftp_outcr'}; + $tmp =~ s/(?<!\015)\012/\015\012/sg if $nr; + $tmp =~ s/^\015// if ${*$data}{'net_ftp_outcr'}; ${*$data}{'net_ftp_outcr'} = substr($tmp, -1) eq "\015"; # If the remote server has closed the connection we will be signal'd |