diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-09 16:22:25 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-09 16:22:25 +0000 |
commit | eb507ebd880b3b5eaba74c77ddfeb11166281393 (patch) | |
tree | 0fe273444545f887cde39c0aa345cef0326ccb7b /ext | |
parent | 08e1428b7bf2baaa9fefeacfaef518dc75cc9c64 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/raddrinfo.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index a730a1b4c4..3e5bfe13ba 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -157,9 +157,17 @@ struct getaddrinfo_arg 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 |