ruby-changes:32854
From: usa <ko1@a...>
Date: Fri, 14 Feb 2014 12:58:04 +0900 (JST)
Subject: [ruby-changes:32854] usa:r44933 (ruby_1_9_3): merge revision(s) 41215, 41216, 41217: [Backport #8627]
usa 2014-02-14 12:57:59 +0900 (Fri, 14 Feb 2014) New Revision: 44933 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44933 Log: merge revision(s) 41215,41216,41217: [Backport #8627] * 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_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/ext/socket/raddrinfo.c branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 44932) +++ ruby_1_9_3/ChangeLog (revision 44933) @@ -1,3 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Fri Feb 14 12:52:50 2014 Kouhei Sutou <kou@c...> + + * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent. + +Fri Feb 14 12:52:50 2014 Kouhei Sutou <kou@c...> + + * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return + value assignment. + +Fri Feb 14 12:52:50 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] + Fri Feb 14 12:45:07 2014 NAKAMURA Usaku <usa@r...> * lib/thread.rb (SizedQueue#clear): wake waiting threads when called. Index: ruby_1_9_3/ext/socket/raddrinfo.c =================================================================== --- ruby_1_9_3/ext/socket/raddrinfo.c (revision 44932) +++ ruby_1_9_3/ext/socket/raddrinfo.c (revision 44933) @@ -157,9 +157,17 @@ struct getaddrinfo_arg https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/socket/raddrinfo.c#L157 static VALUE nogvl_getaddrinfo(void *arg) { + int ret; struct getaddrinfo_arg *ptr = arg; - return 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 (VALUE)ret; } #endif Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 44932) +++ ruby_1_9_3/version.h (revision 44933) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 516 +#define RUBY_PATCHLEVEL 517 #define RUBY_RELEASE_DATE "2014-02-14" #define RUBY_RELEASE_YEAR 2014 Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r41215-41217 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/