archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 30457:

Browse source 
* 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@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2011-05-20 22:25:41 +00:00
parent 9c2fba7cba
commit 6bc97ee8b1
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 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. * win32/README.win32: note to need NT based OS to build ruby.

4
ext/socket/socket.c
View file

@ -3218,6 +3218,10 @@ make_addrinfo(res0)
} }
base = rb_ary_new(); base = rb_ary_new();
for (res = res0; res; res = res->ai_next) { 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); ary = ipaddr(res->ai_addr);
rb_ary_push(ary, INT2FIX(res->ai_family)); rb_ary_push(ary, INT2FIX(res->ai_family));
rb_ary_push(ary, INT2FIX(res->ai_socktype)); rb_ary_push(ary, INT2FIX(res->ai_socktype));