knu	2010-06-25 23:41:59 +0900 (Fri, 25 Jun 2010)

  New Revision: 28433

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

  Log:
    * ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
      getaddrinfo problem on Mac OS X Snow Leopard.  [ruby-core:29427]
      patch by Wataru Kimura.  [ruby-core:30842] [Backport #3474]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/socket/socket.c
    branches/ruby_1_8/test/socket/test_socket.rb

Index: ruby_1_8/ext/socket/socket.c
===================================================================
--- ruby_1_8/ext/socket/socket.c	(revision 28432)
+++ ruby_1_8/ext/socket/socket.c	(revision 28433)
@@ -234,6 +234,33 @@
 #endif
 #endif
 
+static int str_isnumber __P((const char *));
+
+#if defined(__APPLE__)
+/* fix [ruby-core:29427] */
+static int
+ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
+			 struct addrinfo *hints, struct addrinfo **res)
+{
+    const char *tmp_servname;
+    struct addrinfo tmp_hints;
+    tmp_servname = servname;
+    MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
+    if (nodename && servname) {
+	if (str_isnumber(tmp_servname) && atoi(servname) == 0) {
+	    tmp_servname = NULL;
+#ifdef AI_NUMERICSERV
+	    if (tmp_hints.ai_flags) tmp_hints.ai_flags &= ~AI_NUMERICSERV;
+#endif
+	}
+    }
+    int error = getaddrinfo(nodename, tmp_servname, &tmp_hints, res);
+    return error;
+}
+#undef getaddrinfo
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__darwin((node),(serv),(hints),(res))
+#endif
+
 #ifdef HAVE_CLOSESOCKET
 #undef close
 #define close closesocket
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28432)
+++ ruby_1_8/ChangeLog	(revision 28433)
@@ -1,3 +1,9 @@
+Fri Jun 25 11:37:34 2010  Akinori MUSHA  <knu@i...>
+
+	* ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
+	  getaddrinfo problem on Mac OS X Snow Leopard.  [ruby-core:29427]
+	  patch by Wataru Kimura.  [ruby-core:30842] [Backport #3474]
+
 Wed Jun 23 21:36:45 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: avoid getcontext() overhead if possible.
Index: ruby_1_8/test/socket/test_socket.rb
===================================================================
--- ruby_1_8/test/socket/test_socket.rb	(revision 28432)
+++ ruby_1_8/test/socket/test_socket.rb	(revision 28433)
@@ -71,6 +71,14 @@
       }
     end
   end
+
+  def test_getaddrinfo_raises_no_errors_on_port_argument_of_0 # [ruby-core:29427]
+    assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', 0, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
+    assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '0', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
+    assert_nothing_raised('[ruby-core:29427]'){ Socket.getaddrinfo('localhost', '00', Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
+    assert_raise(SocketError, '[ruby-core:29427]'){ Socket.getaddrinfo(nil, nil, Socket::AF_INET, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME) }
+    assert_nothing_raised('[ruby-core:29427]'){ TCPServer.open('localhost', 0) {} }
+  end
 end if defined?(Socket)
 
 class TestSocket < Test::Unit::TestCase

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