diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 03:57:59 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 03:57:59 +0000 |
| commit | a540b10c96c187005c5037bcc942262234c43b45 (patch) | |
| tree | 1c116b8b5cb754f0a33bfd0d016e4e9b70c6dd0b | |
| parent | d88502b70fecc39964157829f526b67ebe2210c7 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,17 @@ +Fri Feb 14 12:52:50 2014 Kouhei Sutou <kou@cozmixng.org> + + * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent. + +Fri Feb 14 12:52:50 2014 Kouhei Sutou <kou@cozmixng.org> + + * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return + value assignment. + +Fri Feb 14 12:52:50 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * lib/thread.rb (SizedQueue#clear): wake waiting threads when called. diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 80e59a073f..fc2f63a9b3 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -157,9 +157,17 @@ struct getaddrinfo_arg 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 @@ -1,5 +1,5 @@ #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 |