Changeset 833 for trunk

Timestamp:

10/21/09 21:51:10 (5 weeks ago)

Author:

bradfitz

Message:

Checking in changes prior to tagging of version 1.28. Changelog diff is:

Index: ChangeLog
===================================================================
--- ChangeLog (revision 832)
+++ ChangeLog (working copy)
@@ -1,4 +1,7 @@
+2009-10-21: version 1.28

+ * IPv6 support (https://rt.cpan.org/Ticket/Display.html?id=50577)
+

• Add Encode.pm requirement to Makefile.PL for perl 5.6.x (Ask).

2009-09-22: version 1.27

Location:

trunk/api/perl

Files:

• ChangeLog (modified) (1 diff)
• lib/Cache/Memcached.pm (modified) (4 diffs)

trunk/api/perl/ChangeLog

@@ +1 @@
+2009-10-21: version 1.28
+
+        * IPv6 support (https://rt.cpan.org/Ticket/Display.html?id=50577)
 
         * Add Encode.pm requirement to Makefile.PL for perl 5.6.x (Ask).

trunk/api/perl/lib/Cache/Memcached.pm

@@ -36 +36 @@
 use constant COMPRESS_SAVINGS => 0.20; # percent
 
-use vars qw($VERSION $HAVE_ZLIB $FLAG_NOSIGNAL);
-$VERSION = "1.27";
+use vars qw($VERSION $HAVE_ZLIB $FLAG_NOSIGNAL $HAVE_SOCKET6);
+$VERSION = "1.28";
 
 BEGIN {
     $HAVE_ZLIB = eval "use Compress::Zlib (); 1;";
+    $HAVE_SOCKET6 = eval "use Socket6 qw(AF_INET6 PF_INET6); 1;";
 }
 
@@ -232 +233 @@
 
     my $now = time();
-    my ($ip, $port) = $host =~ /(.*):(\d+)/;
+    my ($ip, $port) = $host =~ /(.*):(\d+)$/;
+    $ip =~ s/[\[\]]//g; # get rid of optional IPv6 brackets
+
     return undef if
         $host_dead{$host} && $host_dead{$host} > $now;
@@ -245 +248 @@
         # if a preferred IP is known, try that first.
         if ($self && $self->{pref_ip}{$ip}) {
-            socket($sock, PF_INET, SOCK_STREAM, $proto);
-            $sock_map{$sock} = $host;
             my $prefip = $self->{pref_ip}{$ip};
-            $sin = Socket::sockaddr_in($port,Socket::inet_aton($prefip));
+            if ($HAVE_SOCKET6 && index($prefip, ':') != -1) {
+                no strict 'subs';  # for PF_INET6 and AF_INET6, weirdly imported
+                socket($sock, PF_INET6, SOCK_STREAM, $proto);
+                $sock_map{$sock} = $host;
+                $sin = Socket6::pack_sockaddr_in6($port,
+                                                  Socket6::inet_pton(AF_INET6, $prefip));
+            } else {
+                socket($sock, PF_INET, SOCK_STREAM, $proto);
+                $sock_map{$sock} = $host;
+                $sin = Socket::sockaddr_in($port, Socket::inet_aton($prefip));
+            }
+
             if (_connect_sock($sock,$sin,$self->{connect_timeout})) {
                 $connected = 1;
@@ -261 +273 @@
         # normal path, or fallback path if preferred IP failed
         unless ($connected) {
-            socket($sock, PF_INET, SOCK_STREAM, $proto);
-            $sock_map{$sock} = $host;
-            $sin = Socket::sockaddr_in($port,Socket::inet_aton($ip));
+            if ($HAVE_SOCKET6 && index($ip, ':') != -1) {
+                no strict 'subs';  # for PF_INET6 and AF_INET6, weirdly imported
+                socket($sock, PF_INET6, SOCK_STREAM, $proto);
+                $sock_map{$sock} = $host;
+                $sin = Socket6::pack_sockaddr_in6($port,
+                                                  Socket6::inet_pton(AF_INET6, $ip));
+            } else {
+                socket($sock, PF_INET, SOCK_STREAM, $proto);
+                $sock_map{$sock} = $host;
+                $sin = Socket::sockaddr_in($port, Socket::inet_aton($ip));
+            }
+
             my $timeout = $self ? $self->{connect_timeout} : 0.25;
-            unless (_connect_sock($sock,$sin,$timeout)) {
+            unless (_connect_sock($sock, $sin, $timeout)) {
                 my $cb = $self ? $self->{cb_connect_fail} : undef;
                 $cb->($ip) if $cb;