nagachika	2014-02-10 01:22:25 +0900 (Mon, 10 Feb 2014)

  New Revision: 44900

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

  Log:
    merge revision(s) r41215,r41216,r41217: [Backport #8627] [Backport #9506]
    
    * ext/socket/raddrinfo.c (nogvl_getaddrinfo): work around for Ubuntu
      13.04's getaddrinfo issue with mdns4. [ruby-list:49420]
    
    * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return
      value assignment.
    
    * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/socket/raddrinfo.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44899)
+++ ruby_2_0_0/ChangeLog	(revision 44900)
@@ -1,3 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Feb 10 01:15:10 2014  Kouhei Sutou  <kou@c...>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
+
+Mon Feb 10 01:15:10 2014  Kouhei Sutou  <kou@c...>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return
+	  value assignment.
+
+Mon Feb 10 01:15:10 2014  NARUSE, Yui  <naruse@r...>
+
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): work around for Ubuntu
+	  13.04's getaddrinfo issue with mdns4. [ruby-list:49420]
+
 Mon Feb 10 00:42:12 2014  Masaki Matsushita  <glass.saga@g...>
 
 	* ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
Index: ruby_2_0_0/ext/socket/raddrinfo.c
===================================================================
--- ruby_2_0_0/ext/socket/raddrinfo.c	(revision 44899)
+++ ruby_2_0_0/ext/socket/raddrinfo.c	(revision 44900)
@@ -157,9 +157,17 @@ struct getaddrinfo_arg https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/socket/raddrinfo.c#L157
 static void *
 nogvl_getaddrinfo(void *arg)
 {
+    int ret;
     struct getaddrinfo_arg *ptr = arg;
-    return (void *)(VALUE)getaddrinfo(ptr->node, ptr->service,
-				      ptr->hints, ptr->res);
+    ret = getaddrinfo(ptr->node, ptr->service, ptr->hints, ptr->res);
+#ifdef __linux__
+    /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
+     * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
+     */
+    if (ret == EAI_SYSTEM && errno == ENOENT)
+	ret = EAI_NONAME;
+#endif
+    return (void *)(VALUE)ret;
 }
 #endif
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44899)
+++ ruby_2_0_0/version.h	(revision 44900)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-02-10"
-#define RUBY_PATCHLEVEL 399
+#define RUBY_PATCHLEVEL 400
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41215-41217


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