summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E Keenan <jkeenan@cpan.org>2018-01-18 22:05:45 -0500
committerJames E Keenan <jkeenan@cpan.org>2018-01-18 22:05:45 -0500
commit7d97880ddc4f275caa3eeab435a4f5a8cf601971 (patch)
tree4353f043b0970ed7e7e9a34c54c59edbc903e895
parent0a72295b18f94b3152f7f55dfa0c3fd2d9ad5593 (diff)
downloadperl-7d97880ddc4f275caa3eeab435a4f5a8cf601971.tar.gz
Sync Socket with CPAN (2.025 -> 2.027).
Addresses RT # 132737.
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Socket/Makefile.PL5
-rw-r--r--cpan/Socket/Socket.pm5
-rw-r--r--cpan/Socket/Socket.xs7
4 files changed, 11 insertions, 8 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 003f9a4b8f..0337a9e943 100755
--- 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 4061c743e2..5eab38080a 100644
--- 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 a47bb5acae..370deef103 100644
--- 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 8e8bc4ebd1..b11ea751a7 100644
--- 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! */