summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgregor herrmann <gregoa@debian.org>2024-04-19 16:40:33 +0200
committergregor herrmann <gregoa@debian.org>2024-04-19 16:40:33 +0200
commit9e92029e1440fe589e4b8f844b57b2ca1ceec597 (patch)
tree33fc35245950b499725cb2be9d2d3f501f48bc0b
parent5c505d292a692a81279d63c6a80e662ca3ff5c0b (diff)
parentb852a252dfce4849c5556a7cbdcce61bf4e76383 (diff)
Update upstream source from tag 'upstream/2.038'
Update to upstream version '2.038' with Debian dir 2fae415d9e1be415925d930414a302f6e881752b
-rw-r--r--Changes8
-rw-r--r--META.json2
-rw-r--r--META.yml2
-rw-r--r--Makefile.PL15
-rw-r--r--Socket.pm15
-rw-r--r--Socket.xs14
6 files changed, 33 insertions, 23 deletions
diff --git a/Changes b/Changes
index 8dea543..79eecd4 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,13 @@
Revision history for Socket
+2.038 2024-04-15
+ [CHANGES]
+ * Add extra TCP_ and IPV6_ constants for Linux (RT143712)
+
+ [BUGFIXES]
+ * Account for newer Solaris behaviour on AF_UNIX address length
+ (RT152866)
+
2.037 2023-06-06
[CHANGES]
* Convert hard tabs to spaces in source files
diff --git a/META.json b/META.json
index cc9a0e4..4c7dbea 100644
--- a/META.json
+++ b/META.json
@@ -38,6 +38,6 @@
}
},
"release_status" : "stable",
- "version" : "2.037",
+ "version" : "2.038",
"x_serialization_backend" : "JSON::PP version 4.16"
}
diff --git a/META.yml b/META.yml
index 05b6684..bb9a87f 100644
--- a/META.yml
+++ b/META.yml
@@ -20,5 +20,5 @@ no_index:
- inc
requires:
perl: '5.006001'
-version: '2.037'
+version: '2.038'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/Makefile.PL b/Makefile.PL
index c9e8d54..066d28a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -191,7 +191,7 @@ my @names = (
IPV6_ADDRFROM IPV6_ADD_MEMBERSHIP IPV6_DROP_MEMBERSHIP IPV6_JOIN_GROUP
IPV6_LEAVE_GROUP IPV6_MTU IPV6_MTU_DISCOVER IPV6_MULTICAST_HOPS
IPV6_MULTICAST_IF IPV6_MULTICAST_LOOP IPV6_RECVERR IPV6_ROUTER_ALERT
- IPV6_UNICAST_HOPS IPV6_V6ONLY
+ IPV6_TCLASS IPV6_UNICAST_HOPS IPV6_V6ONLY
LOCAL_CONNWAIT LOCAL_CREDS LOCAL_OCREDS LOCAL_PEEREID
@@ -229,12 +229,13 @@ my @names = (
SO_SNDTIMEO SO_STATE SO_TIMESTAMP SO_TYPE SO_USELOOPBACK SO_XOPEN
SO_XSE
- TCP_CONGESTION TCP_CONNECTIONTIMEOUT TCP_CORK TCP_DEFER_ACCEPT
- 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_USER_TIMEOUT
- TCP_WINDOW_CLAMP
+ TCP_CC_INFO TCP_CONGESTION TCP_CONNECTIONTIMEOUT TCP_CORK
+ TCP_DEFER_ACCEPT TCP_FASTOPEN TCP_FASTOPEN_CONNECT TCP_FASTOPEN_KEY
+ TCP_FASTOPEN_NO_COOKIE TCP_INFO TCP_INIT_CWND TCP_KEEPALIVE TCP_KEEPCNT
+ TCP_KEEPIDLE TCP_KEEPINTVL TCP_LINGER2 TCP_MAXRT TCP_MAXSEG TCP_MD5SIG
+ TCP_MD5SIG_EXT TCP_NODELAY TCP_NOOPT TCP_NOPUSH TCP_NOTSENT_LOWAT
+ TCP_QUICKACK TCP_SACK_ENABLE TCP_STDURG TCP_SYNCNT TCP_TIMESTAMP
+ TCP_TX_DELAY TCP_USER_TIMEOUT TCP_WINDOW_CLAMP
UIO_MAXIOV
),
diff --git a/Socket.pm b/Socket.pm
index 81a99f8..daf4d64 100644
--- a/Socket.pm
+++ b/Socket.pm
@@ -3,7 +3,7 @@ package Socket;
use v5.6.1;
use strict;
-our $VERSION = '2.037';
+our $VERSION = '2.038';
=head1 NAME
@@ -779,11 +779,12 @@ our @EXPORT_OK = qw(
IPTOS_LOWDELAY IPTOS_THROUGHPUT IPTOS_RELIABILITY IPTOS_MINCOST
- TCP_CONGESTION TCP_CONNECTIONTIMEOUT TCP_CORK TCP_DEFER_ACCEPT
- 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_USER_TIMEOUT
+ TCP_CC_INFO TCP_CONGESTION TCP_CONNECTIONTIMEOUT TCP_CORK TCP_DEFER_ACCEPT
+ TCP_FASTOPEN TCP_FASTOPEN_CONNECT TCP_FASTOPEN_KEY TCP_FASTOPEN_NO_COOKIE
+ TCP_INFO TCP_INIT_CWND TCP_KEEPALIVE TCP_KEEPCNT TCP_KEEPIDLE TCP_KEEPINTVL
+ TCP_LINGER2 TCP_MAXRT TCP_MAXSEG TCP_MD5SIG TCP_MD5SIG_EXT TCP_NODELAY
+ TCP_NOOPT TCP_NOPUSH TCP_NOTSENT_LOWAT TCP_QUICKACK TCP_SACK_ENABLE
+ TCP_STDURG TCP_SYNCNT TCP_TIMESTAMP TCP_TX_DELAY TCP_USER_TIMEOUT
TCP_WINDOW_CLAMP
IN6ADDR_ANY IN6ADDR_LOOPBACK
@@ -791,7 +792,7 @@ our @EXPORT_OK = qw(
IPV6_ADDRFROM IPV6_ADD_MEMBERSHIP IPV6_DROP_MEMBERSHIP IPV6_JOIN_GROUP
IPV6_LEAVE_GROUP IPV6_MTU IPV6_MTU_DISCOVER IPV6_MULTICAST_HOPS
IPV6_MULTICAST_IF IPV6_MULTICAST_LOOP IPV6_RECVERR IPV6_ROUTER_ALERT
- IPV6_UNICAST_HOPS IPV6_V6ONLY
+ IPV6_TCLASS IPV6_UNICAST_HOPS IPV6_V6ONLY
SO_INCOMING_CPU SO_INCOMING_NAPI_ID SO_LOCK_FILTER SO_RCVBUFFORCE
SO_SNDBUFFORCE
diff --git a/Socket.xs b/Socket.xs
index 42e76db..1bd52a1 100644
--- a/Socket.xs
+++ b/Socket.xs
@@ -352,16 +352,16 @@ static void my_CvCONST_off(pTHX_ CV *cv)
* cannot distinguish between failure and a local broadcast address.
*/
static int
-my_inet_aton(register const char *cp, struct in_addr *addr)
+my_inet_aton(const char *cp, struct in_addr *addr)
{
dTHX;
- register U32 val;
- register int base;
- register char c;
+ U32 val;
+ int base;
+ char c;
int nparts;
const char *s;
unsigned int parts[4];
- register unsigned int *pp = parts;
+ unsigned int *pp = parts;
if (!cp || !*cp)
return 0;
@@ -935,8 +935,8 @@ unpack_sockaddr_un(sun_sv)
if (!SvOK(sun_sv))
croak("Undefined address for %s", "Socket::unpack_sockaddr_un");
sun_ad = SvPVbyte(sun_sv,sockaddrlen);
-# if defined(__linux__) || defined(__CYGWIN__) || defined(HAS_SOCKADDR_SA_LEN)
- /* On Linux, Cygwin or *BSD sockaddrlen on sockets returned by accept,
+# if defined(__linux__) || defined(__CYGWIN__) || defined(sun) || defined(HAS_SOCKADDR_SA_LEN)
+ /* On Linux, Cygwin, Solaris or *BSD sockaddrlen on sockets returned by accept,
* recvfrom, getpeername and getsockname is not equal to sizeof(addr). */
if (sockaddrlen < sizeof(addr)) {
Copy(sun_ad, &addr, sockaddrlen, char);