kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 41215,41216,41217: [Backport #8627]

Browse source 
* 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
This commit is contained in:
usa 2014-02-14 03:57:59 +00:00
parent d88502b70f
commit a540b10c96
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -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.

12
ext/socket/raddrinfo.c
View file

@ -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

2
version.h
View file

@ -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