Back-port a getpeername() fix from IO version 1.30.

Also add a missing defined() that fixes send on unix domain sockets.

1 files changed, 3 insertions, 4 deletions

diff --git a/gnu/usr.bin/perl/ext/IO/lib/IO/Socket.pm b/gnu/usr.bin/perl/ext/IO/lib/IO/Socket.pm
index 4429f2bb3e6..57ef71a8a18 100644
--- a/gnu/usr.bin/perl/ext/IO/lib/IO/Socket.pm
+++ b/gnu/usr.bin/perl/ext/IO/lib/IO/Socket.pm
@@ -195,9 +195,7 @@ sub sockname {
 sub peername {
     @_ == 1 or croak 'usage: $sock->peername()';
     my($sock) = @_;
-    getpeername($sock)
-      || ${*$sock}{'io_socket_peername'}
-      || undef;
+    ${*$sock}{'io_socket_peername'} ||= getpeername($sock);
 }
 
 sub connected {
@@ -213,7 +211,7 @@ sub send {
     my $peer  = $_[3] || $sock->peername;
 
     croak 'send: Cannot determine peer address'
-	 unless($peer);
+	 unless(defined($peer));
 
     my $r = defined(getpeername($sock))
 	? send($sock, $_[1], $flags)
@@ -239,6 +237,7 @@ sub recv {
 sub shutdown {
     @_ == 2 or croak 'usage: $sock->shutdown(HOW)';
     my($sock, $how) = @_;
+    ${*$sock}{'io_socket_peername'} = undef;
     shutdown($sock, $how);
 }