Skip to content

Commit

Permalink
Revert fixes for [rt.cpan.org #61577]
Browse files Browse the repository at this point in the history
These changes introduced some test failures on AIX and other platforms,
and rather than dig around for more failing platforms during the RCx
period, we will revert this to reapply later when it is more tested.

This reverts commit 01b71c8.

This reverts commit b690361.

This reverts commit 271d04e.
  • Loading branch information
rjbs committed May 14, 2012
1 parent 29534a1 commit a5bed83
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 198 deletions.
1 change: 0 additions & 1 deletion AUTHORS
Expand Up @@ -250,7 +250,6 @@ Daniel Chetlin <daniel@chetlin.com>
Daniel Dragan <bulk88@hotmail.com>
Daniel Frederick Crisman <daniel@crisman.org>
Daniel Grisinger <dgris@dimensional.com>
Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Daniel Lieberman <daniel@bitpusher.com>
Daniel Muiño <dmuino@afip.gov.ar>
Daniel P. Berrange <dan@berrange.com>
Expand Down
3 changes: 0 additions & 3 deletions MANIFEST
Expand Up @@ -3259,9 +3259,6 @@ dist/IO/Makefile.PL IO extension makefile writer
dist/IO/poll.c IO poll() emulation using select()
dist/IO/poll.h IO poll() emulation using select()
dist/IO/README IO extension maintenance notice
dist/IO/t/cachepropagate-tcp.t See if IO::Socket duplication works
dist/IO/t/cachepropagate-udp.t See if IO::Socket duplication works
dist/IO/t/cachepropagate-unix.t See if IO::Socket duplication works
dist/IO/t/io_const.t See if constants from IO work
dist/IO/t/io_dir.t See if directory-related methods from IO work
dist/IO/t/io_dup.t See if dup()-related methods from IO work
Expand Down
3 changes: 0 additions & 3 deletions META.yml
Expand Up @@ -78,9 +78,6 @@ no_index:
- dist/IO/poll.c
- dist/IO/poll.h
- dist/IO/README
- dist/IO/t/cachepropagate-tcp.t
- dist/IO/t/cachepropagate-udp.t
- dist/IO/t/cachepropagate-unix.t
- dist/IO/t/IO.t
- dist/IO/t/io_const.t
- dist/IO/t/io_dir.t
Expand Down
3 changes: 0 additions & 3 deletions dist/IO/Makefile.PL
Expand Up @@ -33,9 +33,6 @@ WriteMakefile(
OBJECT => '$(O_FILES)',
ABSTRACT => 'Perl core IO modules',
AUTHOR => 'Graham Barr <gbarr@cpan.org>',
PREREQ_PM => {
'Test::More' => 0,
},
( $PERL_CORE
? ()
: (
Expand Down
11 changes: 1 addition & 10 deletions dist/IO/lib/IO/Socket.pm
Expand Up @@ -24,7 +24,7 @@ require IO::Socket::UNIX if ($^O ne 'epoc' && $^O ne 'symbian');

@ISA = qw(IO::Handle);

$VERSION = "1.35";
$VERSION = "1.34";

@EXPORT_OK = qw(sockatmark);

Expand Down Expand Up @@ -349,27 +349,18 @@ sub timeout {
sub sockdomain {
@_ == 1 or croak 'usage: $sock->sockdomain()';
my $sock = shift;
if (!defined(${*$sock}{'io_socket_domain'})) {
my $addr = $sock->sockname();
${*$sock}{'io_socket_domain'} = sockaddr_family($addr)
if (defined($addr));
}
${*$sock}{'io_socket_domain'};
}

sub socktype {
@_ == 1 or croak 'usage: $sock->socktype()';
my $sock = shift;
${*$sock}{'io_socket_type'} = $sock->sockopt(Socket::SO_TYPE)
if (!defined(${*$sock}{'io_socket_type'}) && defined(eval{Socket::SO_TYPE}));
${*$sock}{'io_socket_type'}
}

sub protocol {
@_ == 1 or croak 'usage: $sock->protocol()';
my($sock) = @_;
${*$sock}{'io_socket_proto'} = $sock->sockopt(Socket::SO_PROTOCOL)
if (!defined(${*$sock}{'io_socket_proto'}) && defined(eval{Socket::SO_PROTOCOL}));
${*$sock}{'io_socket_proto'};
}

Expand Down
56 changes: 0 additions & 56 deletions dist/IO/t/cachepropagate-tcp.t

This file was deleted.

34 changes: 0 additions & 34 deletions dist/IO/t/cachepropagate-udp.t

This file was deleted.

88 changes: 0 additions & 88 deletions dist/IO/t/cachepropagate-unix.t

This file was deleted.

0 comments on commit a5bed83

Please sign in to comment.