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) 50404,50405: [Backport #10975]

Browse source 
* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
	  before other library calls and use rb_syserr_fail.
	  [ruby-core:68531] [Bug #10975]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-05-21 04:59:03 +00:00
parent bdf81a66cf
commit ad70c73ccb
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu May 21 13:57:47 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
before other library calls and use rb_syserr_fail.
[ruby-core:68531] [Bug #10975]
Thu May 21 13:32:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of

8
ext/socket/ipsocket.c
View file

@ -41,6 +41,7 @@ inetsock_cleanup(struct inetsock_arg *arg)
static VALUE
init_inetsock_internal(struct inetsock_arg *arg)
{
int error = 0;
int type = arg->type;
struct addrinfo *res, *lres;
int fd, status = 0, local = 0;
@ -80,6 +81,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
syscall = "socket(2)";
fd = status;
if (fd < 0) {
error = errno;
continue;
}
arg->fd = fd;
@ -107,6 +109,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
}
if (status < 0) {
error = errno;
close(fd);
arg->fd = fd = -1;
continue;
@ -124,7 +127,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
port = arg->remote.serv;
}
rsock_sys_fail_host_port(syscall, host, port);
rsock_syserr_fail_host_port(error, syscall, host, port);
}
arg->fd = -1;
@ -132,8 +135,9 @@ init_inetsock_internal(struct inetsock_arg *arg)
if (type == INET_SERVER) {
status = listen(fd, SOMAXCONN);
if (status < 0) {
error = errno;
close(fd);
rb_sys_fail("listen(2)");
rb_syserr_fail(error, "listen(2)");
}
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.7"
#define RUBY_RELEASE_DATE "2015-05-21"
#define RUBY_PATCHLEVEL 351
#define RUBY_PATCHLEVEL 352
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 5