Commit Graph

3652 Commits

Author SHA1 Message Date
Pieter Hintjens
527eddc90d Merge pull request #1183 from mschneider/size_fix
ZMQ API diverges from POSIX
2014-10-20 23:17:47 +02:00
Pieter Hintjens
b1d766a39a Merge pull request #1219 from pmienk/master
Update travis script to configure with libsodium.
2014-10-19 09:08:30 +02:00
Pieter Hintjens
607fa58b7f Merge pull request #1218 from johntconklin/master
Support --with and --without options for libsodium and pgm
2014-10-19 09:08:12 +02:00
Phillip Mienk
7c33d91a78 Update travis script to configure with libsodium. 2014-10-18 19:23:37 -07:00
J.T. Conklin
9078a7a4a5 Add support for --with/--without libsodium and --with/--without pgm
command line options.
2014-10-18 17:08:53 -07:00
J.T. Conklin
64a92cce49 Support both --with-* and --without-* options for libsodium and pgm 2014-10-18 16:49:46 -07:00
Pieter Hintjens
39b8ac303a Merge pull request #1217 from johntconklin/master
Append to libzmq_la_CPPFLAGS and libzmq_la_LIBADD.
2014-10-18 08:54:01 +02:00
Pieter Hintjens
ebfe6354e0 Merge pull request #1214 from johntconklin/master
Remove build and runtime dependencies on e2fsprogs and e2fsprogs-devel.
2014-10-18 00:34:35 +02:00
Pieter Hintjens
0e7458daf3 Merge pull request #1216 from xaqq/pollpri
Add support for POLLPRI flag.
2014-10-18 00:33:20 +02:00
Kapp Arnaud
779c37abc4 Add support for POLLPRI flag.
This commit adds a ZMQ_POLLPRI flag that maps to poll()'s POLLPRI
flag.
This flags does nothing for OMQ sockets. It's only useful for raw
file descriptor (be it socket or file).
This flag does nothing if poll() is not the underlying polling
function. So it is Linux only.
2014-10-17 17:21:41 +02:00
KAPP Arnaud
a109723b17 Merge pull request #1207 from hintjens/master
Releasing 4.1.0 rc1 and moving development master to 4.2.0.
2014-10-17 17:16:24 +02:00
J.T. Conklin
2e0c1a9883 Append to libzmq_la_CPPFLAGS and libzmq_la_LIBADD. 2014-10-16 20:11:33 -07:00
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
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