disable non-blocking pipes and sockets by default

normal · normal · commit 9d74d402e150 · 2018-11-29T20:00:00.000Z
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
diff --git a/ext/socket/init.c b/ext/socket/init.c
@@ -435,15 +435,15 @@ rsock_socket0(int domain, int type, int proto)
     static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 
     if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
-        ret = socket(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, proto);
+        ret = socket(domain, type|SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT, proto);
         if (ret >= 0) {
             if (ret <= 2)
                 goto fix_cloexec;
             goto update_max_fd;
         }
     }
     else if (cloexec_state < 0) { /* usually runs once only for detection */
-        ret = socket(domain, type|SOCK_CLOEXEC|SOCK_NONBLOCK, proto);
+        ret = socket(domain, type|SOCK_CLOEXEC|RSOCK_NONBLOCK_DEFAULT, proto);
         if (ret >= 0) {
             cloexec_state = rsock_detect_cloexec(ret);
             if (cloexec_state == 0 || ret <= 2)
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
@@ -32,7 +32,7 @@
  */
 #  define RSOCK_NONBLOCK_DEFAULT (0)
 #else
-#  define RSOCK_NONBLOCK_DEFAULT (1)
+#  define RSOCK_NONBLOCK_DEFAULT (0)
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  ifdef HAVE_NETINET_IN_SYSTM_H
diff --git 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))
diff --git a/io.c b/io.c
@@ -138,7 +138,8 @@ off_t __syscall(quad_t number, ...);
 #if defined(_WIN32)
 #  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
 #elif defined(O_NONBLOCK)
-#  define RUBY_PIPE_NONBLOCK_DEFAULT    (O_NONBLOCK)
+  /* disabled for [Bug #15356] (Rack::Deflater + rails) failure: */
+#  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
 #else /* any platforms where O_NONBLOCK does not exist? */
 #  define RUBY_PIPE_NONBLOCK_DEFAULT    (0)
 #endif
diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb
@@ -159,8 +159,8 @@ def test_read_write_nonblock
       set_nb = true
       buf = String.new
       if ssock.respond_to?(:nonblock?)
-        assert_predicate(ssock, :nonblock?)
-        assert_predicate(csock, :nonblock?)
+        assert_not_predicate(ssock, :nonblock?)
+        assert_not_predicate(csock, :nonblock?)
         csock.nonblock = ssock.nonblock = false
 
         # Linux may use MSG_DONTWAIT to avoid setting O_NONBLOCK

Original file line number	Diff line number	Diff line change
`@@ -175,16 +175,17 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])`
`175`	`175`	`{`
`176`	`176`	`int ret;`
`177`	`177`	`static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */`
	`178`	`+ static const int default_flags = SOCK_CLOEXEC\|RSOCK_NONBLOCK_DEFAULT;`
`178`	`179`
`179`	`180`	`if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */`
`180`		`- ret = socketpair(domain, type\|SOCK_CLOEXEC\|SOCK_NONBLOCK, protocol, sv);`
	`181`	`+ ret = socketpair(domain, type\|default_flags, protocol, sv);`
`181`	`182`	`if (ret == 0 && (sv[0] <= 2 \|\| sv[1] <= 2)) {`
`182`	`183`	`goto fix_cloexec; /* highly unlikely */`
`183`	`184`	`}`
`184`	`185`	`goto update_max_fd;`
`185`	`186`	`}`
`186`	`187`	`else if (cloexec_state < 0) { /* usually runs once only for detection */`
`187`		`- ret = socketpair(domain, type\|SOCK_CLOEXEC\|SOCK_NONBLOCK, protocol, sv);`
	`188`	`+ ret = socketpair(domain, type\|default_flags, protocol, sv);`
`188`	`189`	`if (ret == 0) {`
`189`	`190`	`cloexec_state = rsock_detect_cloexec(sv[0]);`
`190`	`191`	`if ((cloexec_state == 0) \|\| (sv[0] <= 2 \|\| sv[1] <= 2))`