Pieter Hintjens
30d34888e0
Merge pull request #690 from mattconnolly/master
...
config for libsodium in alternate path, using CPP flags for both C and C...
2013-09-29 04:22:24 -07:00
Matt Connolly
7660b78e12
config for libsodium in alternate path, using CPP flags for both C and C++ sources.
2013-09-29 21:20:14 +10:00
Pieter Hintjens
6c25d2f880
Merge pull request #689 from minrk/curve_keygen
...
include missing platform.hpp in curve_keygen
2013-09-29 02:29:53 -07:00
MinRK
cf4bfd48cf
include missing platform.hpp in curve_keygen
...
it was excluded, so HAVE_SODIUM would never be defined,
leading to curve_keygen always reporting "recompile with libsodium"
2013-09-28 15:42:52 -07:00
MinRK
3d7b2b4c04
declare z85_encode / decode in zmq_utils
...
they are used by curve_keygen, but not available
2013-09-28 15:42:00 -07:00
Pieter Hintjens
f1002e9492
Merge pull request #688 from mattconnolly/master
...
This pull requests fixes building on SmartOS and possibly other Solaris-like systems
2013-09-27 04:30:24 -07:00
Matt Connolly
848ce1adb1
Disable compiler warning for Solaris
2013-09-27 11:20:09 +00:00
Matt Connolly
aa84e85153
Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup.
2013-09-27 11:12:16 +00:00
Richard Newton
2af23cf40c
Merge pull request #687 from hintjens/master
...
Updated CMake project for test_issue_566
2013-09-26 05:39:17 -07:00
Pieter Hintjens
015b43f969
Updated CMake project for test_issue_566
2013-09-26 14:32:47 +02:00
Martin Hurton
d568e7f587
Merge pull request #686 from hintjens/master
...
Added test case for issue 566
2013-09-26 05:30:59 -07:00
Pieter Hintjens
e42a0a4074
Added test case for issue 566
...
* Tests dealer-to-router connection 100 times
* This was failing in ZMQ v4.0.0 RC1
2013-09-26 14:18:40 +02:00
Richard Newton
5271bc9db3
Merge pull request #685 from hintjens/master
...
Build/test errors on OS/X with clang++
2013-09-26 02:45:14 -07:00
Pieter Hintjens
26d5ac4075
curve_keygen needed assert.h
2013-09-26 11:35:52 +02:00
Pieter Hintjens
9d51155ce2
Build/test errors on OS/X with clang++
2013-09-26 11:33:44 +02:00
Pieter Hintjens
9827a1278b
Merge pull request #684 from hurtonm/master
...
Call flush after writing the identity message
2013-09-26 01:01:47 -07:00
Martin Hurton
be25cfdf35
Call flush after writing the identity message
2013-09-26 09:40:23 +02:00
Richard Newton
f06bf8d25b
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-09-25 13:27:20 +01:00
Richard Newton
b0b2567fcf
Merge pull request #683 from hintjens/master
...
Updated libzmq CURVE to track RFC 27
2013-09-24 08:11:17 -07:00
Pieter Hintjens
82149dde19
Updated libzmq CURVE to track RFC 27
...
* The INITIATE command vouch box is Box[C',S](C->S') instead of Box[C'](C->S),
as recommended by https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/ ,
to reduce the risk of client impersonation.
* Mirrors the change in libcurve and CurveZMQ specifications.
2013-09-24 15:31:10 +02:00
Pieter Hintjens
cc2823e240
Merge pull request #682 from hintjens/master
...
Fixed build for MSVC 2008
2013-09-24 03:48:09 -07:00
Pieter Hintjens
51fe8cfe52
Merge pull request #681 from ipechorin/master
...
stdint.h is not available on all platforms
2013-09-24 03:32:34 -07:00
Pieter Hintjens
b3346fb37a
Fixed build for MSVC 2008
2013-09-24 12:29:21 +02:00
Ivan Pechorin
b504aad160
stdint.h is not available on all platforms
2013-09-24 14:10:31 +04:00
Richard Newton
5f0a8dcffe
Merge pull request #680 from hintjens/master
...
Bumped library version and age
2013-09-24 00:24:45 -07:00
Pieter Hintjens
186b713aba
Bumped library version and age
2013-09-24 09:10:39 +02:00
Pieter Hintjens
920385c40f
Merge pull request #679 from mattconnolly/master
...
Update configure: Allow libsodium to be installed in a custom path
2013-09-23 23:00:33 -07:00
Matt Connolly
12eef06e45
Update configure: Allow libsodium to be installed in a custom path
2013-09-24 08:07:43 +10:00
Matt Connolly
7b5da7dc09
git ignore test run output files: tests/test*.{log|trs}
2013-09-24 08:07:10 +10:00
Richard Newton
9db0791cd5
Revert "Copy platform.hpp into src directory in cmake build."
...
This reverts commit 11b699e73cbda47ff450554ebca2385d20a0b75a.
2013-09-23 08:29:34 +01:00
Richard Newton
efbe7d45fa
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-09-23 08:28:34 +01:00
Richard Newton
0e7124b656
Merge pull request #678 from hintjens/master
...
Move away from port 8080 which is occupied on some boxes
2013-09-20 14:27:11 -07:00
Pieter Hintjens
f36a49de6d
Move away from port 8080 which is occupied on some boxes
2013-09-20 23:16:29 +02:00
Richard Newton
59f1fbc9a2
Merge pull request #677 from vortechs2000/fix_aix
...
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
2013-09-20 12:45:00 -07:00
AJ Lewis
e3e7efedbe
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
...
This reverts commit 015d9564ee16959847a30a0ec3b080f718f40678.
2013-09-20 14:38:11 -05:00
Richard Newton
aa2aab1785
Merge pull request #674 from hintjens/master
...
Fixed packaging (makefiles were wrong)
2013-09-20 12:13:11 -07:00
Richard Newton
11b699e73c
Copy platform.hpp into src directory in cmake build.
2013-09-20 19:34:31 +01:00
Pieter Hintjens
1293f1b956
Merge pull request #675 from vortechs2000/fix_aix
...
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
2013-09-20 09:54:00 -07:00
AJ Lewis
015d9564ee
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
2013-09-20 11:48:18 -05:00
Pieter Hintjens
b49aa7a65d
Updated NEWS for 4.0.0 release
2013-09-20 17:28:19 +02:00
Pieter Hintjens
0d3f9eb592
Missing file from Makefile.am
2013-09-20 16:40:40 +02:00
Pieter Hintjens
21157f7d85
Next version off libzmq master is 4.1.0
2013-09-20 15:59:16 +02:00
Pieter Hintjens
84a013e3de
Fixed packaging for source distribution
2013-09-20 15:58:55 +02:00
Richard Newton
1a9ea3e24a
Merge pull request #673 from hintjens/master
...
Renamed new socket options to be clearer
2013-09-20 06:41:30 -07:00
Pieter Hintjens
5e609be345
Renamed new socket options to be clearer
...
* ZMQ_REQ_STRICT was negative option (default 1) which goes against
the standard, where defaults are zero. I renamed this to
ZMQ_REQ_RELAXED.
* ZMQ_REQ_REQUEST_IDS felt clumsy and describes the technical solution
rather than the problem/requirement. I changed to ZMQ_REQ_CORRELATE
which seems more explicit.
2013-09-20 15:30:04 +02:00
Richard Newton
aaf2a2cdfb
Merge pull request #672 from hintjens/master
...
Renamed test_connect_delay to test_immediate to match name of option
2013-09-20 06:24:47 -07:00
Pieter Hintjens
0997a8b753
Removed inaccurate note in zmq_poll man page
2013-09-20 14:39:35 +02:00
Pieter Hintjens
71c9ae8b18
Built zmq_send_const man page properly
2013-09-20 14:28:06 +02:00
Pieter Hintjens
92c01f69db
Renamed test_connect_delay to test_immediate
...
* The ZMQ_CONNECT_DELAY option was renamed to ZMQ_IMMEDIATE
2013-09-20 14:23:43 +02:00
Pieter Hintjens
0644256ef4
Updated NEWS for 3.2.x releases
2013-09-20 13:28:16 +02:00