0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00

2748 Commits

Author SHA1 Message Date
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
Pieter Hintjens
8f0a757f08 Merge pull request #671 from ricnewton/master
Testing github jenkins integration
2013-09-19 06:09:13 -07:00
Richard Newton
78cabfe8ea More testing github jenkins integration 2013-09-19 12:58:58 +01:00
Richard Newton
d503e19381 Merge branch 'master' of https://github.com/zeromq/libzmq 2013-09-19 12:37:54 +01:00
Richard Newton
544575d18c Revert "More testing github jenkins integratio"
This reverts commit 0640d6d2baa014ad93ba57ad2f692af8f9081eb0.
2013-09-19 12:28:21 +01:00
Richard Newton
0640d6d2ba More testing github jenkins integratio 2013-09-19 12:11:50 +01:00
Richard Newton
575ff39bfe Testing github jenkins integration 2013-09-19 12:02:17 +01:00
Pieter Hintjens
90867a4e8f Merge pull request #670 from ricnewton/master
Fix cmake build
2013-09-19 02:42:31 -07:00
Richard Newton
7a747b5797 Fix cmake build 2013-09-19 09:46:26 +01:00
Richard Newton
39de9bebcb Merge pull request #669 from hintjens/master
Renamed inproc connect test (name was too long)
2013-09-19 00:43:49 -07:00
Pieter Hintjens
e05556075f Renamed inproc connect test (name was too long) 2013-09-19 09:36:43 +02:00
Richard Newton
de91c7362c Merge pull request #668 from mrothe/no-public-tests
tests: don't listen on public ports
2013-09-18 04:09:51 -07:00
Richard Newton
94c98abba3 Merge pull request #667 from hintjens/master
Reverted pull request 666
2013-09-18 04:07:35 -07:00
Markus Rothe
b13230510c tests: don't listen on public ports 2013-09-18 12:58:19 +02:00
Pieter Hintjens
825052f83f Revert "makes curve keys symetric as in libcurve + factorisation"
This reverts commit bfd472f97cad5e37fa384b687a906f515600bac4.
2013-09-17 14:05:55 +02:00
Pieter Hintjens
22eb4d600b Revert "oblige the application to explicitely set the node type for PLAIN"
This reverts commit 1206f4572b4b3bb405a14cc60605b75d53b819a0.
2013-09-17 14:05:41 +02:00
Pieter Hintjens
9e66685c08 Reformatted text 2013-09-17 13:33:27 +02:00
Pieter Hintjens
dc79171fc3 Merge pull request #666 from lalebarde/master
curve key names as in libcurve, symetry design, a few logic improvements
2013-09-17 04:32:45 -07:00