зеркало из https://github.com/github/ruby.git
* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
prohibit inheritance of sockets, too. [experimental] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
e9db21d9cf
Коммит
4532c0d81e
|
@ -1,3 +1,8 @@
|
|||
Fri Jul 11 16:16:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
|
||||
prohibit inheritance of sockets, too. [experimental]
|
||||
|
||||
Fri Jul 11 14:39:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (CreateChild): the measures for Vista is no longer
|
||||
|
@ -36,9 +41,11 @@ Thu Jul 10 21:15:49 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
|
|||
* test/win32ole/test_win32ole_method.rb: ditto.
|
||||
|
||||
Thu Jul 10 19:38:35 2008 wanabe <s.wanabe@gmail.com>
|
||||
|
||||
* test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
|
||||
|
||||
Thu Jul 10 18:29:41 2008 wanabe <s.wanabe@gmail.com>
|
||||
|
||||
* test/ruby/envutil.rb (assert_normal_exit): finish writing script
|
||||
before spawn("ruby") to avoid blocking in win32.
|
||||
|
||||
|
|
|
@ -2269,7 +2269,7 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
|
|||
s = -1;
|
||||
}
|
||||
else {
|
||||
s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY);
|
||||
s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY|O_NOINHERIT);
|
||||
}
|
||||
});
|
||||
return s;
|
||||
|
@ -2568,7 +2568,7 @@ rb_w32_socket(int af, int type, int protocol)
|
|||
fd = -1;
|
||||
}
|
||||
else {
|
||||
fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY);
|
||||
fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY|O_NOINHERIT);
|
||||
}
|
||||
});
|
||||
return fd;
|
||||
|
@ -2788,8 +2788,8 @@ rb_w32_socketpair(int af, int type, int protocol, int *sv)
|
|||
|
||||
if (socketpair_internal(af, type, protocol, pair) < 0)
|
||||
return -1;
|
||||
sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY);
|
||||
sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY);
|
||||
sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY|O_NOINHERIT);
|
||||
sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY|O_NOINHERIT);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче