0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-22 07:29:31 +08:00

4090 Commits

Author SHA1 Message Date
Pieter Hintjens
359933ae8f Merge pull request #1213 from dmick/master
Fix builds/msvc/Makefile.am to include all properties files in the build
2014-10-17 01:40:36 +02:00
Pieter Hintjens
983eaecc4c Merge pull request #1212 from dstftw/fix-typos
Fix some typos
2014-10-17 01:40:09 +02:00
Dan Mick
c22bcf4f65 Fix builds/msvc/Makefile.am to include all properties files in the build
I attempted to fix up the properties files manifests in the Makefile,
but neglected the end-of-line escape characters.  It was good enough
to pass whatever make dist on Linux did, but I had no Windows build
env to test in.  The broken change was in commit de4a442.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2014-10-16 14:18:23 -07:00
Sergey M․
76d86c3fc3 Fix some typos 2014-10-17 04:10:33 +07:00
J.T. Conklin
9289845c83 Remove build and runtime dependencies on e2fsprogs and e2fsprogs-devel. 2014-10-16 06:13:36 -07:00
Pieter Hintjens
08d90e8a05 Merge pull request #1210 from pmienk/master
Correct libsodium inclusion.
2014-10-16 14:48:21 +02:00
Phillip Mienk
8cf5e9fd48 Correct declaration of HAVE_LIBSODIUM. 2014-10-16 04:44:21 -07:00
Pieter Hintjens
eb89555a24 Merge pull request #1209 from pmienk/master
Simplify libsodium inclusion
2014-10-16 12:05:36 +02:00
Phillip Mienk
c8ee16940f Require pkg-config, use pkg-config to pull seek libsodium. 2014-10-16 00:37:57 -07:00
Pieter Hintjens
b6762a6a8b Marked TCP and IPC filters as deprecated (ZAP) 2014-10-14 16:30:20 +02:00
Pieter Hintjens
bc0f8d5168 Updated development master to 4.2.x 2014-10-14 16:30:20 +02:00
Pieter Hintjens
7f849b844b Updated NEWS for 4.0.x releases 2014-10-14 16:30:20 +02:00
Pieter Hintjens
3f10e401c3 Merge pull request #1208 from pmienk/master
Reduce automake recursion; simplify pgm dependency
2014-10-14 11:34:14 +02:00
Phillip Mienk
00b3bfab10 Remove local pgm configuration option, cleanup configure.ac, remove unused Makefile.am instances. 2014-10-13 19:10:36 -07:00
Phillip Mienk
c6aedc3837 Partial migration to nonrecursive make. 2014-10-10 14:36:12 -07:00
Pieter Hintjens
3aa5a9d409 Merge pull request #1202 from pavel-pimenov/fix-pvs-studio
PVS Studio small fix
v4.1.0
2014-10-09 10:46:58 +02:00
Pavel Pimenov
18ee219ce7 Fix V815 Decreased performance. Consider replacing the expression 'peer_address = ""' with 'peer_address.clear()'. stream_engine.cpp 99 2014-10-09 09:41:49 +04:00
Pavel Pimenov
0e3d40c806 Fix V815 Decreased performance. Consider replacing the expression 'options.socks_proxy_address != ""' with '!options.socks_proxy_address.empty()'. session_base.cpp 497 2014-10-09 09:40:59 +04:00
Pavel Pimenov
0b541b789a Fix V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment.
Replace iterator++ with ++iterator. stream_engine.cpp
    http://www.viva64.com/en/d/0165/print/
2014-10-09 09:37:55 +04:00
Pieter Hintjens
432c8496ea Merge pull request #1201 from johntconklin/master
Remove build and runtime dependencies on uuid and uuid-devel.
2014-10-07 09:26:07 +02:00
J.T. Conklin
fbce7a2407 Remove build and runtime dependencies on uuid and uuid-devel. 2014-10-07 00:11:53 -07:00
Pieter Hintjens
cb9a0d2af4 Merge pull request #1200 from dmick/master
Fix up spec build
2014-10-02 21:31:47 +02:00
Dan Mick
dfd021b133 builds/redhat/zeromq.spec: fix manpage lists
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-10-01 20:50:04 -07:00
Dan Mick
8fde2d646c src/Makefile.am: libzmq.vers must go in dist tarball
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-10-01 20:49:38 -07:00
Dan Mick
2a0fa6baf5 builds/redhat/zeromq.spec: missing '%'
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-10-01 20:49:00 -07:00
Dan Mick
de4a442263 builds/msvc/Makefile.am: fix up project file/property file paths
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-10-01 15:53:15 -07:00
Dan Mick
91cc9a2fd0 src/Makefile.am: i_properties.hpp removed some time ago
Signed-off-by: Dan Mick <dmick@localhost.localdomain>
2014-10-01 15:39:03 -07:00
Dan Mick
d3c391c3d4 zeromq.spec.in: shared library version bump
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-09-30 23:22:57 -07:00
Dan Mick
6e53253d11 zeromq.spec.in: Missing build dependencies in specfile: asciidoc, xmlto
Signed-off-by: Dan Mick <dmick@redhat.com>
2014-09-30 23:21:06 -07:00
Pieter Hintjens
43028c7229 Merge pull request #1198 from toussa/master
Problem : Build failed with MinGW on windows
2014-09-24 17:34:36 +02:00
Michaël Paul
7c5906d138 Problem : Build failed with MinGW on windows 2014-09-24 15:46:43 +02:00
Pieter Hintjens
ca0a216f52 Merge pull request #1196 from evoskuil/master
Update NuGet package.
2014-09-24 11:55:46 +02:00
evoskuil
cf4c03cf01 Update NuGet package. 2014-09-23 14:58:37 -07:00
Pieter Hintjens
e40d4b2376 Merge pull request #1189 from steamraven/master
Problem: curve messages can be replayed
2014-09-20 10:22:33 +02:00
Matthew Hawn
0900a48921 Problem: curve messages can be replayed
Solution: ensure message short nonces are strictly increasing and validate them
2014-09-19 18:07:57 -06:00
Martin Hurton
fe4396c597 Merge pull request #1188 from hintjens/master
Problem: stream_engine.cpp security can be downgraded
2014-09-19 20:16:09 +02:00
Pieter Hintjens
77f14aad95 Problem: stream_engine.cpp security can be downgraded
Solution: accept only the mechanism defined by the socket options.

I've not tested this yet, so it's a speculative fix.
2014-09-19 19:24:45 +02:00
Martin Hurton
8e9005d591 Merge pull request #1186 from hintjens/master
Problem: test_security_curve does't try wrong mechanisms
2014-09-18 10:09:49 +02:00
Pieter Hintjens
57ade6d5bb Problem: test_security_curve does't try wrong mechanisms
Solution: check that it rejects attempts to connect to a CURVE server
using NULL or PLAIN client.
2014-09-18 07:32:07 +02:00
Martin Hurton
2bf89bd0f8 Merge pull request #1185 from banburybill/master
Fix hang terminating PGM ZMQ_SUB (#822).
2014-09-17 18:39:45 +02:00
Jim Hague
94943bab3b Fix hang terminating PGM ZMQ_SUB (#822). 2014-09-17 17:21:44 +01:00
Maximilian Schneider
b55288fdf3 return values of socket functions are ssize_t (not int) in compliance with POSIX
deprecated API (zmq_msg_recv/zmq_msg_send) still returns int
2014-09-17 02:44:48 -04:00
Martin Hurton
19712d3fbb Merge pull request #1181 from whoshuu/patch-1
Fix non-constant-expression narrowing
2014-09-17 00:41:29 +02:00
Huu Nguyen
5642366f10 Fix non-constant-expression narrowing
For OS X, the microseconds field is implemented as an int type. The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: non-constant-expression cannot be narrowed from type 'long' to '__darwin_suseconds_t' (aka 'int') in initializer list [-Wc++11-narrowing]".

Tested on Clang 5.1.0 and Mac OS X 10.9.4.
2014-09-16 14:34:11 -07:00
Pieter Hintjens
4b70793f1f Merge pull request #1179 from hurtonm/master
Stop session's timer when pipe terminates
2014-09-12 17:25:47 +02:00
Martin Hurton
50e0915f98 Stop session's timer when pipe terminates 2014-09-12 16:53:05 +02:00
Pieter Hintjens
be9fecdbc3 Merge pull request #1178 from evoskuil/master
Update nuget package.
2014-09-12 07:22:51 +02:00
evoskuil
a8e900c7b3 Update nuget package 2014-09-11 17:31:48 -07:00
Pieter Hintjens
c897af508d Merge pull request #1177 from hurtonm/master
Code cleanup
2014-09-11 16:16:43 +02:00
Martin Hurton
5a497d7d0c Code cleanup 2014-09-11 16:01:56 +02:00
Martin Hurton
41a9968c2e Merge pull request #1176 from hintjens/master
Problem: undocumented limit on IPC paths in Linux is 107 chars
2014-09-10 10:08:04 +02:00
Pieter Hintjens
51c8c1d67a Problem: undocumented limit on IPC paths in Linux is 107 chars
Solution: document the limit of 113 chars including ipc://. We might
fix this in libzmq by shortening an over-long IPC pathname into a
unique string; so long as this is done consistently in bind and in
connect, it will save applications from weird failures when they
use external data to generate IPC pathnames.
2014-09-10 09:38:04 +02:00
Pieter Hintjens
cca297c313 Merge pull request #1173 from evoskuil/master
Fix configure warning.
2014-09-04 07:09:43 +02:00
evoskuil
8cd85857fb Fix potential redefinition of common DEBUG symbol, replace tabs. 2014-09-02 23:39:33 -07:00
Pieter Hintjens
2c1d5f5a96 Merge pull request #1174 from jbreams/master
Clean up after using randombytes from libsodium
2014-08-31 20:34:10 +02:00
Jonathan Reams
d1881acbdc Clean up after using randombytes from libsodium
When Curve authentication is used, libsodium opens a file
descriptor to /dev/urandom to generate random bytes. When
the ZMQ context terminates, it should ensure that file gets
closed.
2014-08-31 13:30:44 -04:00
anonymous
992dca6ba7 Fix configure warning. 2014-08-30 21:38:54 -07:00
Pieter Hintjens
83c6bc20db Merge pull request #1172 from evoskuil/master
Fix clang build break from unused var.
2014-08-29 10:06:58 +02:00
evoskuil
d76536eb70 Default Travis clang build fails on unused variable 'MAX_SENDS'. 2014-08-28 18:25:35 -07:00
evoskuil
2208907a88 Hide VS turd. 2014-08-28 18:21:51 -07:00
Martin Hurton
21e20127b6 Merge pull request #1171 from hintjens/master
Problem: nodrop code is ugly
2014-08-27 13:58:56 +02:00
Pieter Hintjens
f15146b5d2 Problem: nodrop code is ugly
It's bad practice to start by testing all exceptional conditions
and then dropping through to the 'normal' condition. Apart from
being inefficient, it's deceptive to the user. Conditional code
should always try to show the natural expectation of the code,
with exceptional cases coming last.

Solution: clean up this code.
2014-08-27 13:51:25 +02:00
Martin Hurton
128bed472b Merge pull request #1170 from hintjens/master
Fixed issues with xpub nodrop property
2014-08-27 13:25:27 +02:00
Pieter Hintjens
2584c3a724 Added test cases to .gitignore 2014-08-27 12:06:54 +02:00
Pieter Hintjens
35040aaf18 Problem: issues with nodrop property
- not initialized before use
- name is nasty (boolean variables should not have negative names)

Solution: rename to 'lossy' and initialize to 'true'.
2014-08-27 12:06:54 +02:00
Pieter Hintjens
81485c7688 Merge pull request #1168 from ricnewton/master
Fix test broken when we changed FD_SETSIZE.
2014-08-26 11:14:09 +02:00
Richard Newton
8926cb3ddb Fix test broken when we changed FD_SETSIZE. 2014-08-26 08:36:51 +01:00
Richard Newton
3811b0b1ef Merge pull request #1166 from hintjens/master
Problem: FD_SETSIZE 1024 is too restrictive under Windows
2014-08-26 08:29:47 +01:00
Pieter Hintjens
1acc1b1582 Problem: FD_SETSIZE 1024 is too restrictive under Windows
Solution: increased to 4096 by default for all MSVC builds, for MinGW,
and for CMake.

Note: this is a speculative change, it needs confirmation before we
can keep it. Particularly, there is some doubt that changing this in
libzmq will affect upstream applications using libzmq.dll.
2014-08-23 13:59:53 +02:00
Pieter Hintjens
72b8a19691 Merge pull request #1163 from hurtonm/master
Code cleanup
2014-08-14 10:10:10 +02:00
Martin Hurton
f550d66ae3 Code cleanup 2014-08-14 08:58:01 +02:00
Pieter Hintjens
b817f3c61e Merge pull request #1162 from xaqq/encode_decode
Add const qualifier to source parameters for z85 encode/decode
2014-08-14 07:33:24 +02:00
Kapp Arnaud
fbdc5aa22d Add const qualifier to source parameters in zmq_z85_decode and zmq_z85_encode 2014-08-14 00:00:00 +02:00
Pieter Hintjens
fadb2a38d9 Merge pull request #1161 from hurtonm/master
Reset metadata for outbound messages
2014-08-13 09:21:46 +02:00
Martin Hurton
a54d8d7b0c Reset metadata for outbound messages 2014-08-13 08:53:54 +02:00
Pieter Hintjens
25de6a03ac Merge pull request #1159 from kreuzberger/master
Bugfix wrong CMakeLists.txt after rename of file
2014-08-13 06:12:29 +02:00
kreuzberger
212220dda7 Bugfix wrong CMakeLists.txt after rename of file 2014-08-12 21:34:30 +02:00
Martin Hurton
ea719a8dff Merge pull request #1151 from hintjens/master
Documentation patches
2014-08-12 14:04:34 +02:00
Pieter Hintjens
f20b70bef5 Cleaned up test_xpub_nodrop
Renamed test case to actually explain what it's testing, and cleaned up
the code a little.
2014-08-12 12:37:49 +02:00
Pieter Hintjens
a7fed989a6 Minor changes to Travis CI script 2014-08-12 12:37:49 +02:00
Pieter Hintjens
785aebc6a8 Reworking Travis script 2014-08-12 12:37:49 +02:00
Pieter Hintjens
75d4f50be3 Problem: ZMQ_CURVE_SECRETKEY reads beyond end of Z85 data
Solution: change setsockopts on printable keys to expect 41, nor 40
bytes. Code still accepts 40 bytes for compatibility, and copies the
key to a well-terminated string before using it.

Fixes #1148
2014-08-12 12:37:49 +02:00
Pieter Hintjens
0dcf6b5e2b Added AppDynamics as corporate author 2014-08-12 12:37:49 +02:00
Pieter Hintjens
2c5baff95f Note that ZMQ_TCP_ACCEPT_FILTER is deprecated 2014-08-12 12:37:49 +02:00
Pieter Hintjens
acc4fe8794 Merge pull request #1158 from hurtonm/master
Code cleanup
2014-08-12 12:32:24 +02:00
Martin Hurton
214553972d Return -1 when failed to publish message 2014-08-12 10:51:37 +02:00
Martin Hurton
228426ac44 Code cleanup 2014-08-12 09:31:19 +02:00
Pieter Hintjens
bb6d18d5a2 Merge pull request #1156 from kreuzberger/master
Provide socket option for pub sockets to not silently drop message
2014-08-09 00:52:21 +02:00
kreuzberger
f042ea9e26 better naming of flags and variables to real functionality: nodrop 2014-08-08 19:45:41 +02:00
kreuzberger
d9a3cc48d4 do not silently drop messages in publisher if hwm is reached 2014-08-08 19:36:00 +02:00
Pieter Hintjens
446e8efb07 Merge pull request #1155 from mrvn/pull-document_hwm_behaviour_with_ZMQ_ROUTER_MANDATORY
Document altered HWM behaviour when ZMQ_ROUTER_MANDATORY is set.
2014-08-07 13:29:14 +02:00
Goswin von Brederlow
da6cf63857 Document altered HWM behaviour when ZMQ_ROUTER_MANDATORY is set. 2014-08-07 13:16:12 +02:00
Pieter Hintjens
bbbe8d7832 Merge pull request #1154 from mrvn/pull-test_router_mandatory_hwm
Add test for HWM behaviour for mandatory ROUTER sockets over tcp
2014-08-07 13:09:54 +02:00
Goswin von Brederlow
893995e698 Add test for HWM behaviour for mandatory ROUTER sockets over tcp 2014-08-07 12:52:07 +02:00
Pieter Hintjens
0f780ef733 Merge pull request #1152 from drodri/task/cmake_structure
moved root CMakeLists.txt tests config to tests/CMakeLists.txt
2014-08-05 13:37:37 +02:00
Diego
6537e202d6 moved root CMakeLists.txt tests config to tests/CMakeLists.txt 2014-08-05 13:24:32 +02:00
Pieter Hintjens
0c4ee0a9b0 Merge pull request #1147 from rodgert/master
Update zmq_msg_get(ZMQ_SHARED) to return true for type_cmsg messages
2014-07-29 21:12:24 +02:00
Thomas Rodgers
03f097a541 Update zmq_msg_get(ZMQ_SHARED) to return true for type_cmsg messages 2014-07-29 13:43:38 -05:00
Pieter Hintjens
416ee8e75c Merge pull request #1146 from minrk/utf8-metadata
define encoding for message metadata to be UTF8
2014-07-29 01:02:43 +02:00
Pieter Hintjens
10a2e6c24d Merge pull request #1145 from pijyoi/master
use enum retired_fd instead of -1
2014-07-28 22:29:09 +02:00