merge revision(s) 30457:

shyouhei · shyouhei · commit 6bc97ee8b15e · 2011-05-20T22:25:41.000Z
* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby doesn't support IPv6 but system supports it. [ruby-dev:42944] (ruby#4230) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 20 23:23:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
+	  doesn't support IPv6 but system supports it.
+	  [ruby-dev:42944] (#4230)
+
 Fri May 20 23:10:07 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/README.win32: note to need NT based OS to build ruby.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -3218,6 +3218,10 @@ make_addrinfo(res0)
     }
     base = rb_ary_new();
     for (res = res0; res; res = res->ai_next) {
+#if defined(AF_INET6) && !defined(INET6)	/* workaround for Windows */
+	if (res->ai_addr->sa_family == AF_INET6)
+	    continue;
+#endif
 	ary = ipaddr(res->ai_addr);
 	rb_ary_push(ary, INT2FIX(res->ai_family));
 	rb_ary_push(ary, INT2FIX(res->ai_socktype));
