diff options
| author | Jesse Vincent <jesse@bestpractical.com> | 2010-03-25 11:06:19 -0400 |
|---|---|---|
| committer | Jesse Vincent <jesse@bestpractical.com> | 2010-03-25 11:06:19 -0400 |
| commit | d6896be36b2f69111e4e9922186c9c724cc0d038 (patch) | |
| tree | 65ee73882025dde7ca72897925f613c169257c13 /ext/Socket | |
| parent | e014eb68559fa27ccb09cba7633eae6ea5936113 (diff) | |
| download | perl-d6896be36b2f69111e4e9922186c9c724cc0d038.tar.gz | |
Downgrade Socket.pm's new inet_ntop and inet_pton to EXPORT_OK rather
than EXPORT as they're new functions which clobber symbols in downstream
CPAN modules.
Diffstat (limited to 'ext/Socket')
| -rw-r--r-- | ext/Socket/Socket.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm index 48ec5166cc..d4042cde70 100644 --- a/ext/Socket/Socket.pm +++ b/ext/Socket/Socket.pm @@ -1,7 +1,7 @@ package Socket; our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = "1.86"; +$VERSION = "1.87"; =head1 NAME @@ -180,12 +180,16 @@ address family passed in). The host string may be a string hostname, such as 'www.perl.org', or an IP address. If using an IP address, the type of IP address must be consistant with the address family passed into the function. +This function is not exported by default. + =item inet_ntop ADDRESS_FAMILY, IP_ADDRESS Takes an address family, either AF_INET or AF_INET6, and a string (an opaque string as returned by inet_aton() or inet_pton()) and translates it to an IPv4 or IPv6 address string. +This function is not exported by default. + =back =cut @@ -198,7 +202,6 @@ use XSLoader (); @ISA = qw(Exporter); @EXPORT = qw( inet_aton inet_ntoa - inet_pton inet_ntop sockaddr_family pack_sockaddr_in unpack_sockaddr_in pack_sockaddr_un unpack_sockaddr_un @@ -360,6 +363,9 @@ use XSLoader (); @EXPORT_OK = qw(CR LF CRLF $CR $LF $CRLF + inet_pton + inet_ntop + IPPROTO_IP IPPROTO_IPV6 IPPROTO_RAW |