Sync Socket with CPAN (2.025 -> 2.027).

Addresses RT # 132737.

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 003f9a4..0337a9e 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1001,7 +1001,7 @@ use File::Glob qw(:case);
     },
 
     'Socket' => {
-        'DISTRIBUTION' => 'PEVANS/Socket-2.025.tar.gz',
+        'DISTRIBUTION' => 'PEVANS/Socket-2.027.tar.gz',
         'FILES'        => q[cpan/Socket],
     },
 

diff --git a/cpan/Socket/Makefile.PL b/cpan/Socket/Makefile.PL
index 4061c74..5eab380 100644 (file)
--- a/cpan/Socket/Makefile.PL
+++ b/cpan/Socket/Makefile.PL
@@ -80,7 +80,7 @@ my %defines = (
     # -Dfoo                func()         $Config{key}
     HAS_GETADDRINFO  => [ "getaddrinfo",  "d_getaddrinfo" ],
     HAS_GETNAMEINFO  => [ "getnameinfo",  "d_getnameinfo" ],
-    HAS_GAI_STRERROR => [ "gai_strerror" ],
+    HAS_GAI_STRERROR => [ "gai_strerror", "d_gai_strerror" ],
     HAS_INET_ATON    => [ "inet_aton",    "d_inetaton" ],
     HAS_INETNTOP     => [ "inet_ntop",    "d_inetntop" ],
     HAS_INETPTON     => [ "inet_pton",    "d_inetpton" ],
@@ -231,7 +231,8 @@ my @names = (
        TCP_FASTOPEN TCP_INFO TCP_INIT_CWND TCP_KEEPALIVE TCP_KEEPCNT
        TCP_KEEPIDLE TCP_KEEPINTVL TCP_LINGER2 TCP_MAXRT TCP_MAXSEG
        TCP_MD5SIG TCP_NODELAY TCP_NOOPT TCP_NOPUSH TCP_QUICKACK
-       TCP_SACK_ENABLE TCP_STDURG TCP_SYNCNT TCP_WINDOW_CLAMP
+       TCP_SACK_ENABLE TCP_STDURG TCP_SYNCNT TCP_USER_TIMEOUT
+       TCP_WINDOW_CLAMP
 
        UIO_MAXIOV
     ),

diff --git a/cpan/Socket/Socket.pm b/cpan/Socket/Socket.pm
index a47bb5a..370deef 100644 (file)
--- a/cpan/Socket/Socket.pm
+++ b/cpan/Socket/Socket.pm
@@ -3,7 +3,7 @@ package Socket;
 use strict;
 { use 5.006001; }
 
-our $VERSION = '2.025';
+our $VERSION = '2.027';
 
 =head1 NAME
 
@@ -783,7 +783,8 @@ our @EXPORT_OK = qw(
        TCP_FASTOPEN TCP_INFO TCP_INIT_CWND TCP_KEEPALIVE TCP_KEEPCNT
        TCP_KEEPIDLE TCP_KEEPINTVL TCP_LINGER2 TCP_MAXRT TCP_MAXSEG
        TCP_MD5SIG TCP_NODELAY TCP_NOOPT TCP_NOPUSH TCP_QUICKACK
-       TCP_SACK_ENABLE TCP_STDURG TCP_SYNCNT TCP_WINDOW_CLAMP
+       TCP_SACK_ENABLE TCP_STDURG TCP_SYNCNT TCP_USER_TIMEOUT
+       TCP_WINDOW_CLAMP
 
        IN6ADDR_ANY IN6ADDR_LOOPBACK
 

diff --git a/cpan/Socket/Socket.xs b/cpan/Socket/Socket.xs
index 8e8bc4e..b11ea75 100644 (file)
--- a/cpan/Socket/Socket.xs
+++ b/cpan/Socket/Socket.xs
@@ -187,7 +187,7 @@ NETINET_DEFINE_CONTEXT
 #endif /* !SvPVx_nolen */
 
 #ifndef croak_sv
-# define croak_sv(sv)  croak(SvPVx_nolen(sv))
+# define croak_sv(sv)  croak("%s", SvPVx_nolen(sv))
 #endif
 
 #ifndef hv_stores
@@ -826,8 +826,9 @@ pack_sockaddr_un(pathname)
        sun_ad.sun_family = AF_UNIX;
        pathname_pv = SvPV(pathname,len);
        if (len > sizeof(sun_ad.sun_path)) {
-           warn("Path length (%d) is longer than maximum supported length"
-                " (%d) and will be truncated", len, sizeof(sun_ad.sun_path));
+           warn("Path length (%" UVuf ") is longer than maximum supported length"
+                " (%" UVuf ") and will be truncated",
+                (UV)len, (UV)sizeof(sun_ad.sun_path));
            len = sizeof(sun_ad.sun_path);
        }
 #  ifdef OS2   /* Name should start with \socket\ and contain backslashes! */