3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-08 13:25:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from hintjens/master

Browse Source 
Backporting fixes from master
This commit is contained in:
Pieter Hintjens 2013-09-26 03:32:10 -07:00
commit cd452d5019
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NEWS
View File

@ -1,3 +1,16 @@
0MQ version 4.0.1 (RC2), released on 2013/
===============================================
Bug fixes
---------
* Fixed some build/test errors on OS/X + Clang++.
* Updated CURVE mechanism to track revised RFC 27 (INITIATE vouch).
* Fixed LIBZMQ-566 (dealer-to-router connections sometimes failing).
0MQ version 4.0.0 (RC1), released on 2013/09/20
===============================================

2
include/zmq.h
View File

@ -77,7 +77,7 @@ typedef unsigned __int8 uint8_t;
/* Version macros for compile-time API version detection */
#define ZMQ_VERSION_MAJOR 4
#define ZMQ_VERSION_MINOR 0
#define ZMQ_VERSION_PATCH 0
#define ZMQ_VERSION_PATCH 1
#define ZMQ_MAKE_VERSION(major, minor, patch) \
((major) * 10000 + (minor) * 100 + (patch))

2
src/options.cpp
View File

@ -286,7 +286,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
break;
case ZMQ_ZAP_DOMAIN:
if (optvallen_ >= 0 && optvallen_ < 256) {
if (optvallen_ < 256) {
zap_domain.assign ((const char *) optval_, optvallen_);
return 0;
}

1
src/stream_engine.cpp
View File

@ -652,6 +652,7 @@ void zmq::stream_engine_t::mechanism_ready ()
return;
}
errno_assert (rc == 0);
session->flush ();
}
read_msg = &stream_engine_t::pull_and_encode;

1
tests/test_stream.cpp
View File

@ -102,7 +102,6 @@ test_stream_to_dealer (void)
assert (rc >= 0);
bytes_read += rc;
}
assert (rc == 97);
// First two bytes are major and minor version numbers.
assert (buffer [0] == 3); // ZMTP/3.0

1
tools/curve_keygen.c
View File

@ -24,6 +24,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <assert.h>
#include <zmq_utils.h>
#ifdef HAVE_LIBSODIUM
# include <sodium.h>