зеркало из https://github.com/github/ruby.git
* ext/socket/init.c (cloexec_accept): Fix a compile error on
Debian GNU/kFreeBSD. Consider HAVE_ACCEPT4 is defined but SOCK_CLOEXEC is not defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
07636ed42e
Коммит
fbb29bc08c
|
@ -1,3 +1,9 @@
|
|||
Sat Apr 6 01:21:56 2013 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/init.c (cloexec_accept): Fix a compile error on
|
||||
Debian GNU/kFreeBSD. Consider HAVE_ACCEPT4 is defined
|
||||
but SOCK_CLOEXEC is not defined.
|
||||
|
||||
Sat Apr 6 00:19:30 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
|
||||
|
||||
* load.c (features_index_add): use rb_str_subseq() to specify C string
|
||||
|
|
|
@ -497,7 +497,11 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
|
|||
if (address_len) len0 = *address_len;
|
||||
#ifdef HAVE_ACCEPT4
|
||||
if (try_accept4) {
|
||||
ret = accept4(socket, address, address_len, SOCK_CLOEXEC);
|
||||
int flags = 0;
|
||||
#ifdef SOCK_CLOEXEC
|
||||
flags |= SOCK_CLOEXEC;
|
||||
#endif
|
||||
ret = accept4(socket, address, address_len, flags);
|
||||
/* accept4 is available since Linux 2.6.28, glibc 2.10. */
|
||||
if (ret != -1) {
|
||||
if (ret <= 2)
|
||||
|
|
Загрузка…
Ссылка в новой задаче