diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-29 20:00:00 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-29 20:00:00 +0000 |
| commit | 9d74d402e15008c10f80e67595cc861c89a1636b (patch) | |
| tree | 71d73fd903c5047f889aedb1e0cdf98d59bc8175 /ext/socket/socket.c | |
| parent | d7e3043463e7e138a4334b2173d6a3fbe4321e35 (diff) | |
disable non-blocking pipes and sockets by default
There seems to be a compatibility problems with Rails +
Rack::Deflater; so we revert this incompatibility.
This effectively reverts r65922; but keeps the bugfixes to
better support non-blocking sockets and pipes for future use.
[Bug #15356] [Bug #14968]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b6bda8fee8..0059595e1b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -175,16 +175,17 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2]) { int ret; static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */ + static const int default_flags = SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT; if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */ - ret = socketpair(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, protocol, sv); + ret = socketpair(domain, type|default_flags, protocol, sv); if (ret == 0 && (sv[0] <= 2 || sv[1] <= 2)) { goto fix_cloexec; /* highly unlikely */ } goto update_max_fd; } else if (cloexec_state < 0) { /* usually runs once only for detection */ - ret = socketpair(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, protocol, sv); + ret = socketpair(domain, type|default_flags, protocol, sv); if (ret == 0) { cloexec_state = rsock_detect_cloexec(sv[0]); if ((cloexec_state == 0) || (sv[0] <= 2 || sv[1] <= 2)) |