In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0274d83eb3a030f0f8f1272773543bf78589a47c?hp=d172007eda28dc85300d6fb8d6213ae741e1b608>
- Log ----------------------------------------------------------------- commit 0274d83eb3a030f0f8f1272773543bf78589a47c Author: Chris 'BinGOs' Williams <[email protected]> Date: Thu Nov 27 13:58:44 2014 +0000 Update IO-Socket-IP to CPAN version 0.33 [DELTA] 0.33 2014/11/21 16:17:39 [BUGFIXES] * Use SOL_SOCKET/SO_ERROR sockopt rather than 2nd connect() error hoisting to detect nonblocking connect/failure when implementing Timeout (RT98976) (thanks Arthur Axel 'fREW' Schmidt) ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 6 +----- cpan/IO-Socket-IP/lib/IO/Socket/IP.pm | 4 ++-- cpan/IO-Socket-IP/t/22timeout.t | 1 - t/porting/customized.dat | 1 - 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 6a9a259..2b2415a 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -638,15 +638,11 @@ use File::Glob qw(:case); }, 'IO::Socket::IP' => { - 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.32.tar.gz', + 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.33.tar.gz', 'FILES' => q[cpan/IO-Socket-IP], 'EXCLUDED' => [ qr{^examples/}, ], - 'CUSTOMIZED' => [ - # Almost always fails on Win32 since introduced: see CPAN RT#98976 - 't/22timeout.t', - ], }, 'IO::Zlib' => { diff --git a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm index 8ebc44a..d28f1de 100644 --- a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm +++ b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm @@ -7,7 +7,7 @@ package IO::Socket::IP; # $VERSION needs to be set before use base 'IO::Socket' # - https://rt.cpan.org/Ticket/Display.html?id=92107 BEGIN { - $VERSION = '0.32'; + $VERSION = '0.33'; } use strict; @@ -690,7 +690,7 @@ sub connect } # Hoist the error by connect()ing a second time - $err = defined CORE::connect( $self, $addr ) ? 0 : $!+0; + $err = $self->getsockopt( SOL_SOCKET, SO_ERROR ); $err = 0 if $err == EISCONN; # Some OSes give EISCONN $self->blocking( $was_blocking ); diff --git a/cpan/IO-Socket-IP/t/22timeout.t b/cpan/IO-Socket-IP/t/22timeout.t index 56209e8..48bc697 100644 --- a/cpan/IO-Socket-IP/t/22timeout.t +++ b/cpan/IO-Socket-IP/t/22timeout.t @@ -4,7 +4,6 @@ use strict; use warnings; use Test::More; -plan skip_all => "CPAN RT#98976" if $^O eq "MSWin32"; use IO::Socket::IP; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index ffe30ca..b61785b 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -3,7 +3,6 @@ Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 2590c841d9131bcc86549050aa4a270d5ffa2b6a ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm be61d41c5d0399d3e71d32345cddbfd20fc8d645 -IO::Socket::IP cpan/IO-Socket-IP/t/22timeout.t 0a65d4ca44663f70eea3c7f1ccb5faed2940611f PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 Socket cpan/Socket/t/getnameinfo.t f25ae4125d64a81538d4d3b73a3a0b9ce3c0404d Test::Simple cpan/Test-Simple/t/Legacy/exit.t 83edbf569d56d8cdbabea552dfe5602ea1c1822e -- Perl5 Master Repository
