diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-07-01 08:29:51 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-07-01 08:29:51 +0000 |
| commit | cf5a7e3b5004114dbcce44e2d737dbdb91b9fcf0 (patch) | |
| tree | 0b4e780b195bf6d726dbd158261f8eb6617d2d2f /otherlibs/win32unix/accept.c | |
| parent | c631c7a1ddc216ddf9d21c3dc8ca6a74696bddd0 (diff) | |
Re-undo commit 11966 (which is the fix for #5325 that caused #5578) to be synchronized with 4.01 and have a safe trunk.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13860 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/accept.c')
| -rw-r--r-- | otherlibs/win32unix/accept.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c index 6776a4ac3..f2e14467a 100644 --- a/otherlibs/win32unix/accept.c +++ b/otherlibs/win32unix/accept.c @@ -25,15 +25,30 @@ CAMLprim value unix_accept(sock) SOCKET sconn = Socket_val(sock); SOCKET snew; value fd = Val_unit, adr = Val_unit, res; + int oldvalue, oldvaluelen, newvalue, retcode; union sock_addr_union addr; socklen_param_type addr_len; DWORD err = 0; + oldvaluelen = sizeof(oldvalue); + retcode = getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (char *) &oldvalue, &oldvaluelen); + if (retcode == 0) { + /* Set sockets to synchronous mode */ + newvalue = SO_SYNCHRONOUS_NONALERT; + setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (char *) &newvalue, sizeof(newvalue)); + } addr_len = sizeof(sock_addr); enter_blocking_section(); snew = accept(sconn, &addr.s_gen, &addr_len); if (snew == INVALID_SOCKET) err = WSAGetLastError (); leave_blocking_section(); + if (retcode == 0) { + /* Restore initial mode */ + setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (char *) &oldvalue, oldvaluelen); + } if (snew == INVALID_SOCKET) { win32_maperr(err); uerror("accept", Nothing); |