2931 Commits

Author SHA1 Message Date
Pieter Hintjens
42c6ffdc1d Merge pull request #150 from bluca/uninitialised_sockopt
Problem: curve keys getsockopt uninitialised read
2016-02-16 16:14:05 +01:00
Luca Boccassi
5002674fbe Problem: my name is not in the AUTHORS file
Solution: add myself to the list
2016-02-16 14:11:53 +00:00
Luca Boccassi
fdb9c7e035 Problem: NEWS not up to date with bug fixes
Solution: mention issues 1806 and 1807
2016-02-16 14:11:38 +00:00
Luca Boccassi
453b4ce596 Problem: Travis CI uses libsodium unstable branch
Solution: use stable branch instead of the development branch, and
also clone with --depth 1 to make it more efficient.
2016-02-16 14:11:21 +00:00
Luca Boccassi
6e1424349b Problem: curve keys getsockopt uninitialised read
Solution: always initialised zmq::options_t class variables arrays to
avoid reading uninitialised data when CURVE is not yet configured and
a getsockopt ZMQ_CURVE_{SERVER | PUBLIC | SECRET]KEY is issued.

Backport from libzmq.
2016-02-16 14:11:00 +00:00
Pieter Hintjens
1b95e5fead Merge pull request #149 from bluca/gcc6
Problem: build broken with gcc 6
2016-02-12 23:37:52 +01:00
meox
aafdcc8d2e [PATCH] fix error with gcc 5.2 2016-02-12 22:19:51 +00:00
Pieter Hintjens
36b4990e14 Merge pull request #147 from greenjava/master
Fixed errors with CMake 3.4 and VisualStudio 2015
2016-02-04 09:18:16 +01:00
Julien Waechter
c421799fb2 Fixed build with CMake >=3.4.x
Since CMake 3.4.x, in set_target_properties macro, COMPILE_FLAGS with space generate errors (version.rc.res is not generated)
2016-02-04 01:00:15 +01:00
Richard Newton
44588ab730 Update cmake to support Visual Studio 2015 2016-02-03 23:00:56 +01:00
Sergei Nikulov
2ab2cb6028 cmake: fixed error 'install TARGETS given no ARCHIVE DESTINATION for static library target' 2016-02-03 22:39:53 +01:00
Pieter Hintjens
055de7fb7a Merge pull request #146 from jcfr/backport-fix-gcc-warnings
Style: Backport fix gcc warnings
2016-01-30 16:16:52 +01:00
Pieter Hintjens
21b5e4b283 Merge pull request #145 from jcfr/backport-FindAsciiDoc-fix-CMP0053-warning
FindAsciiDoc: fix CMP0053 warning with cmake 3.1
2016-01-30 16:15:53 +01:00
Jean-Christophe Fillion-Robin
d2687e75b6 Fix unused parameter and variable warnings.
Backported from zeromq/libzmq@00aeadd

It fixes the following warnings:

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
In file included from /path/to/src/mechanism.cpp:22:0:
/path/to/src/mechanism.hpp:49:36: warning: unused parameter 'msg_' [-Wunused-parameter]
         virtual int encode (msg_t *msg_) { return 0; }
                                    ^
/path/to/src/mechanism.hpp:51:36: warning: unused parameter 'msg_' [-Wunused-parameter]
         virtual int decode (msg_t *msg_) { return 0; }
                                    ^
/path/to/src/mechanism.cpp:126:51: warning: unused parameter 'name_' [-Wunused-parameter]
 int zmq::mechanism_t::property (const std::string name_,
                                                   ^
/path/to/src/mechanism.cpp:127:45: warning: unused parameter 'value_' [-Wunused-parameter]
                                 const void *value_, size_t length_)
                                             ^
/path/to/src/mechanism.cpp:127:60: warning: unused parameter 'length_' [-Wunused-parameter]
                                 const void *value_, size_t length_)
                                                            ^

/path/to/src/mechanism.cpp:127:60: warning: unused parameter 'length_' [-Wunused-parameter]
                                 const void *value_, size_t length_)
                                                            ^

In file included from /path/to/src/pipe.cpp:28:0:
/path/to/src/ypipe_conflate.hpp: In instantiation of 'bool zmq::ypipe_conflate_t<T, N>::unwrite(T*) [with T = zmq::msg_t; int N = 256]':
/path/to/src/pipe.cpp:489:1:   required from here
/path/to/src/ypipe_conflate.hpp:73:33: warning: unused parameter 'value_' [-Wunused-parameter]
         inline bool unwrite (T *value_)
                                 ^

/path/to/src/zmq_utils.cpp:178:30: warning: unused parameter 'z85_public_key' [-Wunused-parameter]
 int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key)
                              ^
/path/to/src/zmq_utils.cpp:178:52: warning: unused parameter 'z85_secret_key' [-Wunused-parameter]
 int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key)
                                                    ^

/path/to/tests/test_hwm.cpp:205:57: warning: unused parameter 'recv_hwm' [-Wunused-parameter]
 int test_inproc_bind_and_close_first (int send_hwm, int recv_hwm)
                                                         ^
[ 69%] Linking CXX executable bin/test_connect_resolve
/path/to/tests/test_disconnect_inproc.cpp:31:14: warning: unused parameter 'argc' [-Wunused-parameter]
 int main(int argc, char** argv) {
              ^
/path/to/tests/test_disconnect_inproc.cpp:31:27: warning: unused parameter 'argv' [-Wunused-parameter]
 int main(int argc, char** argv) {
                           ^

/path/to/tests/test_stream.cpp:39:81: warning: missing initializer for member 'zmtp_greeting_t::as_server' [-Wmissing-field-initializers]
     = { { 0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F }, { 3, 0 }, { 'N', 'U', 'L', 'L'} };
                                                                                 ^
/path/to/tests/test_stream.cpp:39:81: warning: missing initializer for member 'zmtp_greeting_t::filler' [-Wmissing-field-initializers]
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---

# Conflicts:
#	src/stream.cpp
#	src/stream_engine.cpp
#	tests/test_stream_disconnect_notifications.cpp
2016-01-30 04:13:39 -05:00
Jean-Christophe Fillion-Robin
4055bbb01f Problem: Private/internal macros defined in public header.
Solution: Move the macros to a private header.

Backported from zeromq/libzmq@3341942

# Conflicts:
#	include/zmq.h
#	src/address.cpp
#	src/client.cpp
#	src/server.cpp
#	src/socks_connecter.cpp
#	src/zmq.cpp
2016-01-30 03:52:24 -05:00
Jean-Christophe Fillion-Robin
300d80ffe9 rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
Backported from zeromq/libzmq@63260d8

# Conflicts:
#	include/zmq.h
#	src/client.cpp
#	src/server.cpp
2016-01-30 03:46:46 -05:00
Jean-Christophe Fillion-Robin
9df7ed0740 place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro
Backported from zeromq/libzmq@bff2284

# Conflicts:
#	src/client.cpp
#	src/server.cpp
2016-01-30 03:42:29 -05:00
Jean-Christophe Fillion-Robin
b690bdf148 FindAsciiDoc: fix CMP0053 warning with cmake 3.1
Backported from zeromq/libzmq@032c5ed

This commit fixes the following warnings:

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
CMake Warning (dev) at builds/cmake/Modules/FindAsciiDoc.cmake:9 (find_program):
  Policy CMP0053 is not set: Simplify variable reference and escape sequence
  evaluation.  Run "cmake --help-policy CMP0053" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.

  For input:

    '$ENV{PROGRAMFILES(X86)}/asciidoc'

  the old evaluation rules produce:

    '/asciidoc'

  but the new evaluation rules produce an error:

    Syntax error in cmake code at
      /path/to/builds/cmake/Modules/FindAsciiDoc.cmake:13
    when parsing string
      $ENV{PROGRAMFILES(X86)}/asciidoc
    Invalid character ('(') in a variable name: 'PROGRAMFILES'

  Using the old result for compatibility since the policy is not set.
Call Stack (most recent call first):
  CMakeLists.txt:193 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---

and

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
CMake Warning (dev) at builds/cmake/Modules/FindAsciiDoc.cmake:15 (find_program):
  Policy CMP0053 is not set: Simplify variable reference and escape sequence
  evaluation.  Run "cmake --help-policy CMP0053" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.

  For input:

    '$ENV{PROGRAMFILES(X86)}/asciidoc'

  the old evaluation rules produce:

    '/asciidoc'

  but the new evaluation rules produce an error:

    Syntax error in cmake code at
      /path/to/builds/cmake/Modules/FindAsciiDoc.cmake:19
    when parsing string
      $ENV{PROGRAMFILES(X86)}/asciidoc
    Invalid character ('(') in a variable name: 'PROGRAMFILES'

  Using the old result for compatibility since the policy is not set.
Call Stack (most recent call first):
  CMakeLists.txt:193 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
2016-01-30 03:16:22 -05:00
Constantin Rack
1206dc46cb Merge pull request #144 from jcfr/patch-1
README: Add hyperlinks to explicitly reference reposistories
2016-01-30 08:11:39 +01:00
Jean-Christophe Fillion-Robin
5ade781283 README: Add hyperlinks to explicitly reference reposistories 2016-01-30 01:58:49 -05:00
Pieter Hintjens
e1ebeadd05 Merge pull request #142 from pothosware/master
Fixes for visual studio
2016-01-23 11:48:14 +01:00
Josh Blum
43b9d9d619 Fix C linkage for public symbols MSVC
The header symbols are declared extern "C",
however the the implementations are compiled in a C++ source.
The result is that the library symbols get C++ name mangled
and the resulting dll is missing all of the symbols from the header.
The fix was to add extern "C" in zmq.cpp and zmq_utils.cpp
2016-01-23 01:25:01 -08:00
Josh Blum
27a3f2aa92 Fix static library name overlap under MSVC
The static library was given the same OUTPUT_NAME as the dynamic library.
This leads to one library's build products overwriting the other.
The fix sets the name "libzmq-static" for the static library.
2016-01-23 01:21:29 -08:00
Pieter Hintjens
f080815487 Merge pull request #137 from bluca/ci-container-build
Enable container-based build
2015-08-17 13:07:44 +02:00
Luca Boccassi
aabe7983d1 Enable container-based build
Remove use of "sudo", build and install in local directory in order
to enable container-based CI builds
2015-08-17 01:37:39 +01:00
Richard Newton
bff7f02d15 Merge pull request #136 from bluca/fix-ci-timeout
Problem: CI may fail due to timeout. Fixes #135
2015-08-02 19:31:16 +01:00
Richard Newton
023da3af33 Merge pull request #132 from bluca/fix-autogen-libtool-detection
Solution: check for libtoolize in autogen. Fixes #131
2015-08-02 19:24:16 +01:00
Richard Newton
fb6a0b24f7 Merge pull request #107 from minrk/backport-721
backport stream socket empty frame fix
2015-08-02 19:23:48 +01:00
Luca Boccassi
a228da62b1 Problem: CI may fail due to timeout. Fixes #135
Solution: cherry-pick Pieter Hintjens commit a7a512ab from libzmq
repository to increase test timeouts to 250 msec.
2015-08-02 19:23:15 +01:00
Richard Newton
65911b3729 Merge pull request #134 from bluca/travis-ci-osx
Travis ci osx
2015-08-02 19:22:28 +01:00
Luca Boccassi
d6950515c3 Increase file limit in travis config
Test cases occasionally fail, especially on OSX, due to socket limit.
2015-08-02 19:15:24 +01:00
Luca Boccassi
0918934343 Add OSX build to travis config. Fixes #133 2015-08-02 19:01:46 +01:00
Luca Boccassi
9a71c02dcf Do not use ldconfig in CI if running on OSX
ldconfig is not available on OSX, so Travis CI build fails
2015-08-02 18:51:25 +01:00
Luca Boccassi
8014a226f9 Solution: check for libtoolize in autogen. Fixes #131
Autogen.sh looks for the libtool command as a mean to check if
libtool is available. But distributions like Debian and Ubuntu have
split the libtool package, and the libtool script is now in a
separate package. The solution is to look for the libtoolize command
too before failing, which is what the Autotools chain actually needs
on Linux. Keep checking for libtool to be compatible with OSX, where
the opposite is true.
2015-08-01 12:42:33 +01:00
Pieter Hintjens
ed0dd6a3c4 Merge pull request #130 from leonarf/patch-1
THREAD PRIORITY option documentation
2015-07-16 14:07:17 +02:00
leonarf
630f991bfa THREAD PRIORITY option documentation
Documentation about ZMQ_THREAD_PRIORITY and ZMQ_THREAD_SCHED_POLICY context's option.
2015-07-16 13:52:11 +02:00
Pieter Hintjens
7c3e0187be Merge pull request #129 from calid/master
Updated NEWS
2015-06-29 23:36:36 +02:00
Dylan Cali
1b61fccb09 Updated NEWS 2015-06-29 02:37:45 -05:00
Pieter Hintjens
42007dd754 Merge pull request #128 from calid/libzmq-949-backport
backport zeromq/libzmq#949 fixes to 4-x stable
2015-06-29 08:06:44 +02:00
Dylan Cali
d2574dd45f backport zeromq/libzmq@09e7416
fixes zmq_unbind failing for wildcard endpoints
2015-06-28 23:26:19 -05:00
Dylan Cali
f1cec450db backport zeromq/libzmq@54e0fde
fixes zmq_unbind failing with ENOENT
2015-06-28 23:25:48 -05:00
Dylan Cali
8d59f91acd add tests for zeromq/libzmq#949 2015-06-28 23:25:48 -05:00
Min RK
190e737abf Merge pull request #127 from calid/ignore-test_proxy_single_socket
add test_proxy_single_socket to gitignore
2015-06-28 17:56:15 -07:00
Dylan Cali
35de168c7e add test_proxy_single_socket to gitignore 2015-06-28 19:43:15 -05:00
Pieter Hintjens
de7895bd55 Merge pull request #125 from hintjens/master
Updated version to 4.0.8 for next release
2015-06-15 12:04:47 +02:00
Pieter Hintjens
5c2fb5f792 Updated version to 4.0.8 for next release 2015-06-15 12:04:20 +02:00
Pieter Hintjens
ba8f58ecfc Merge pull request #124 from hintjens/master
Updated NEWS for release 4.0.7
v4.0.7
2015-06-15 11:56:57 +02:00
Pieter Hintjens
e8c4e77088 Updated NEWS for release 4.0.7 2015-06-15 11:56:15 +02:00
Pieter Hintjens
3f6936ecfd Merge pull request #123 from minrk/4.0.7
bump version to 4.0.7
2015-06-08 09:03:01 +02:00
Min RK
3f12984eaa bump version to 4.0.7 2015-06-07 21:28:11 -07:00