mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-17 16:43:58 +00:00
Merge pull request #43 from hintjens/master
Backporting fixes from master
This commit is contained in:
commit
571c668fa2
2
NEWS
2
NEWS
@ -4,6 +4,8 @@
|
|||||||
Bug Fixes
|
Bug Fixes
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
* Fixed #775; compile error on Windows.
|
||||||
|
|
||||||
* Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would
|
* Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would
|
||||||
send an extra identity frame at the start of the connection.
|
send an extra identity frame at the start of the connection.
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
|
|||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (s->mailbox.get_fd () == -1)
|
if (s->mailbox.get_fd () == retired_fd)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
alloc_assert (s);
|
alloc_assert (s);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user