Skip to content

Commit 90deed8

Browse files
authored
Merge pull request #4124 from bluca/news
Update NEWS and fix build on GNU/Hurd
2 parents f3eb691 + a9357db commit 90deed8

File tree

6 files changed

+37
-5
lines changed

6 files changed

+37
-5
lines changed

Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,6 @@ if ON_GNU
14011401
XFAIL_TESTS += tests/test_ipc_wildcard \
14021402
tests/test_reqrep_ipc \
14031403
tests/test_pair_ipc \
1404-
tests/test_rebind_ipc \
14051404
tests/test_term_endpoint
14061405
endif
14071406

NEWS

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
0MQ version 4.3.4 stable, released on 20xx/xx/xx
2+
================================================
3+
4+
* New DRAFT (see NEWS for 4.2.0) socket option:
5+
- ZMQ_PRIORITY will set the SO_PRIORITY socket option on the underlying
6+
sockets. Only supported on Linux.
7+
See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
8+
9+
* Fixed #4113 - compilation errors on kFreeBSD and GNU/Hurd
10+
11+
* Fixed #4086 - excessive amount of socket files left behind in Windows TMP
12+
directory
13+
14+
* Fixed #4108 - regression that breaks using IPv6 link-local addresses on Linux
15+
16+
* Fixed #4078 - compilation errors on Android
17+
18+
* Fixed #4074 - compilation error with ulibc and libbsd
19+
20+
* Fixed #4060 - stack overflow on Windows x64
21+
22+
* Fixed #4051 - various compilation errors on Windows ARM 32bit
23+
24+
* Fixed #4043 - various compilation warnings with XCode
25+
26+
* Fixed #4038 - return value of zmq_ctx_get changed unintentionally
27+
28+
129
0MQ version 4.3.3 stable, released on 2020/09/07
230
================================================
331

doc/zmq_setsockopt.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,9 @@ you may also want to set `ZMQ_HANDSHAKE_IVL` -- the default handshake interval
755755
is 30000 (30 seconds), which is typically too large.
756756

757757
The 'ZMQ_RECONNECT_STOP_AFTER_DISCONNECT' option will stop reconnection when
758-
called zmq_disconnect(). This can be useful when the user request failed(server not
759-
ready),the sokcet do not need to continue to reconnect after user disconnect actively.
758+
zmq_disconnect() has been called. This can be useful when the user's request failed
759+
(server not ready), as the socket does not need to continue to reconnect after
760+
user disconnect actively.
760761

761762
NOTE: in DRAFT state, not yet available in stable releases.
762763

tests/testutil.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
#endif
6868
#endif
6969

70+
#ifndef PATH_MAX
71+
#define PATH_MAX 1024
72+
#endif
73+
7074
const char *SEQ_END = (const char *) 1;
7175

7276
const char bounce_content[] = "12345678ABCDEFGH12345678abcdefgh";

tests/testutil_unity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_)
298298
test_bind (socket_, "tipc://<*>", my_endpoint_, len_);
299299
}
300300

301-
#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
301+
#if defined(ZMQ_HAVE_IPC)
302302
void make_random_ipc_endpoint (char *out_endpoint_)
303303
{
304304
#ifdef ZMQ_HAVE_WINDOWS

tests/testutil_unity.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_);
272272
// Binds to an ipc endpoint using the tipc wildcard address.
273273
void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_);
274274

275-
#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
275+
#if defined(ZMQ_HAVE_IPC)
276276
// utility function to create a random IPC endpoint, similar to what a ipc://*
277277
// wildcard binding does, but in a way it can be reused for multiple binds
278278
// TODO also add a len parameter here

0 commit comments

Comments
 (0)