shyouhei	2011-05-21 07:25:41 +0900 (Sat, 21 May 2011)

  New Revision: 31660

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31660

  Log:
    merge revision(s) 30457:
    
    * ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
      doesn't support IPv6 but system supports it.
      [ruby-dev:42944] (#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@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/socket/socket.c

Index: ruby_1_8_7/ext/socket/socket.c
===================================================================
--- ruby_1_8_7/ext/socket/socket.c	(revision 31659)
+++ ruby_1_8_7/ext/socket/socket.c	(revision 31660)
@@ -3218,6 +3218,10 @@
     }
     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));
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31659)
+++ ruby_1_8_7/ChangeLog	(revision 31660)
@@ -1,3 +1,9 @@
+Fri May 20 23:23:45 2011  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* win32/README.win32: note to need NT based OS to build ruby.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/