From e58f047791f9b81a2154e80f3787006fa4ceb211 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 16 Jan 2021 15:41:58 +0000 Subject: [PATCH 1/3] Problem: typos in zmq_setsockopt.txt Solution: fix them --- doc/zmq_setsockopt.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index 85119948..a010d3d8 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -755,8 +755,9 @@ you may also want to set `ZMQ_HANDSHAKE_IVL` -- the default handshake interval is 30000 (30 seconds), which is typically too large. The 'ZMQ_RECONNECT_STOP_AFTER_DISCONNECT' option will stop reconnection when -called zmq_disconnect(). This can be useful when the user request failed(server not -ready),the sokcet do not need to continue to reconnect after user disconnect actively. +zmq_disconnect() has been called. This can be useful when the user's request failed +(server not ready), as the socket does not need to continue to reconnect after +user disconnect actively. NOTE: in DRAFT state, not yet available in stable releases. From 2347a7641380272c3f28a1fef0ffd345fbc56a56 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 16 Jan 2021 17:34:55 +0000 Subject: [PATCH 2/3] Problem: build broken on debian/hurd Solution: fix it --- Makefile.am | 1 - tests/testutil.cpp | 4 ++++ tests/testutil_unity.cpp | 2 +- tests/testutil_unity.hpp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b1ae7a1..45b07504 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1401,7 +1401,6 @@ if ON_GNU XFAIL_TESTS += tests/test_ipc_wildcard \ tests/test_reqrep_ipc \ tests/test_pair_ipc \ - tests/test_rebind_ipc \ tests/test_term_endpoint endif diff --git a/tests/testutil.cpp b/tests/testutil.cpp index 5a8b3ff2..a8349a49 100644 --- a/tests/testutil.cpp +++ b/tests/testutil.cpp @@ -67,6 +67,10 @@ #endif #endif +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + const char *SEQ_END = (const char *) 1; const char bounce_content[] = "12345678ABCDEFGH12345678abcdefgh"; diff --git a/tests/testutil_unity.cpp b/tests/testutil_unity.cpp index 1c273058..79fda926 100644 --- a/tests/testutil_unity.cpp +++ b/tests/testutil_unity.cpp @@ -298,7 +298,7 @@ void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_) test_bind (socket_, "tipc://<*>", my_endpoint_, len_); } -#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU) +#if defined(ZMQ_HAVE_IPC) void make_random_ipc_endpoint (char *out_endpoint_) { #ifdef ZMQ_HAVE_WINDOWS diff --git a/tests/testutil_unity.hpp b/tests/testutil_unity.hpp index 0be46db2..b00c0c89 100644 --- a/tests/testutil_unity.hpp +++ b/tests/testutil_unity.hpp @@ -272,7 +272,7 @@ void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_); // Binds to an ipc endpoint using the tipc wildcard address. void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_); -#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU) +#if defined(ZMQ_HAVE_IPC) // utility function to create a random IPC endpoint, similar to what a ipc://* // wildcard binding does, but in a way it can be reused for multiple binds // TODO also add a len parameter here From a9357db1d3f973cdf579911d145f8f1d7d575a5e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 16 Jan 2021 17:37:53 +0000 Subject: [PATCH 3/3] Problem: NEWS out of date with latest changes Solution: update it --- NEWS | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/NEWS b/NEWS index d270eb5b..b0357137 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,31 @@ +0MQ version 4.3.4 stable, released on 20xx/xx/xx +================================================ + +* New DRAFT (see NEWS for 4.2.0) socket option: + - ZMQ_PRIORITY will set the SO_PRIORITY socket option on the underlying + sockets. Only supported on Linux. + See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details. + +* Fixed #4113 - compilation errors on kFreeBSD and GNU/Hurd + +* Fixed #4086 - excessive amount of socket files left behind in Windows TMP + directory + +* Fixed #4108 - regression that breaks using IPv6 link-local addresses on Linux + +* Fixed #4078 - compilation errors on Android + +* Fixed #4074 - compilation error with ulibc and libbsd + +* Fixed #4060 - stack overflow on Windows x64 + +* Fixed #4051 - various compilation errors on Windows ARM 32bit + +* Fixed #4043 - various compilation warnings with XCode + +* Fixed #4038 - return value of zmq_ctx_get changed unintentionally + + 0MQ version 4.3.3 stable, released on 2020/09/07 ================================================