3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 16:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111 from hintjens/master

Browse Source 
Problem: shutdown asserts if WSASTARUP wasn't done previously
This commit is contained in:
Pieter Hintjens 2015-04-22 00:29:01 +03:00
commit 3d13448a33
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -5,6 +5,8 @@
* Fixed #1362 - SUB socket sometimes fails to resubscribe properly. * Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
0MQ version 4.0.5 stable, released on 2014/10/14 0MQ version 4.0.5 stable, released on 2014/10/14
================================================ ================================================

15
src/signaler.cpp
View File

@ -146,12 +146,15 @@ zmq::signaler_t::~signaler_t ()
#elif defined ZMQ_HAVE_WINDOWS #elif defined ZMQ_HAVE_WINDOWS
struct linger so_linger = { 1, 0 }; struct linger so_linger = { 1, 0 };
int rc = setsockopt (w, SOL_SOCKET, SO_LINGER, int rc = setsockopt (w, SOL_SOCKET, SO_LINGER,
(char *)&so_linger, sizeof (so_linger)); (const char *) &so_linger, sizeof so_linger);
wsa_assert (rc != SOCKET_ERROR); // Only check shutdown if WSASTARTUP was previously done
rc = closesocket (w); if (rc == 0 || WSAGetLastError () != WSANOTINITIALISED) {
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
rc = closesocket (r); rc = closesocket (w);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
rc = closesocket (r);
wsa_assert (rc != SOCKET_ERROR);
}
#else #else
int rc = close_wait_ms (w); int rc = close_wait_ms (w);
errno_assert (rc == 0); errno_assert (rc == 0);