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

* ext/socket/socket.c (rsock_socketpair0): refactored.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-11-05 09:06:05 +00:00
parent 385a7d4594
commit a3521e0261
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Nov 5 18:05:12 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_socketpair0): refactored.
Sat Nov 5 17:55:52 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/init.c (rsock_socket0): don't clear try_sock_cloexec if

18
ext/socket/socket.c
View file

@ -86,17 +86,15 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])
static int try_sock_cloexec = 1;
if (try_sock_cloexec) {
ret = socketpair(domain, type|SOCK_CLOEXEC, protocol, sv);
if (ret == -1) {
if (ret == -1 && errno == EINVAL) {
/* SOCK_CLOEXEC is available since Linux 2.6.27. Linux 2.6.18 fails with EINVAL */
if (try_sock_cloexec && errno == EINVAL) {
ret = socketpair(domain, type, protocol, sv);
if (ret != -1) {
/* The reason of EINVAL may be other than SOCK_CLOEXEC.
* So disable SOCK_CLOEXEC only if socketpair() succeeds without SOCK_CLOEXEC.
* Ex. Socket.pair(:UNIX, 0xff) fails with EINVAL.
*/
try_sock_cloexec = 0;
}
ret = socketpair(domain, type, protocol, sv);
if (ret != -1) {
/* The reason of EINVAL may be other than SOCK_CLOEXEC.
* So disable SOCK_CLOEXEC only if socketpair() succeeds without SOCK_CLOEXEC.
* Ex. Socket.pair(:UNIX, 0xff) fails with EINVAL.
*/
try_sock_cloexec = 0;
}
}
}