From 4eb4f1fd7e267eee38ed4d402c2cdd7f85532d6b Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 16 May 2015 11:00:07 +0000 Subject: * win32/win32.c (rb_w32_accept): simplified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ win32/win32.c | 29 +++++++++++------------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19c5c82cb3..b590bdeebb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat May 16 19:59:24 2015 NAKAMURA Usaku + + * win32/win32.c (rb_w32_accept): simplified. + Fri May 15 18:28:20 2015 Nobuyoshi Nakada * array.c (rb_ary_assoc, rb_ary_rassoc): [DOC] the result when key diff --git a/win32/win32.c b/win32/win32.c index 55e0d2e94a..e17d35b0c2 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3027,26 +3027,19 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen) StartSockets(); } RUBY_CRITICAL({ - HANDLE h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL); - fd = rb_w32_open_osfhandle((intptr_t)h, O_RDWR|O_BINARY|O_NOINHERIT); - if (fd != -1) { - r = accept(TO_SOCKET(s), addr, addrlen); - if (r != INVALID_SOCKET) { - SetHandleInformation((HANDLE)r, HANDLE_FLAG_INHERIT, 0); - rb_acrt_lowio_lock_fh(fd); - _set_osfhnd(fd, r); - rb_acrt_lowio_unlock_fh(fd); - CloseHandle(h); + r = accept(TO_SOCKET(s), addr, addrlen); + if (r != INVALID_SOCKET) { + SetHandleInformation((HANDLE)r, HANDLE_FLAG_INHERIT, 0); + fd = rb_w32_open_osfhandle((intptr_t)r, O_RDWR|O_BINARY|O_NOINHERIT); + if (fd != -1) socklist_insert(r, 0); - } - else { - errno = map_errno(WSAGetLastError()); - close(fd); - fd = -1; - } + else + closesocket(r); + } + else { + errno = map_errno(WSAGetLastError()); + fd = -1; } - else - CloseHandle(h); }); return fd; } -- cgit v1.2.3