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
Laurent Alebarde
1206f4572b
oblige the application to explicitely set the node type for PLAIN
2013-09-17 12:47:21 +02:00
Laurent Alebarde
bfd472f97c
makes curve keys symetric as in libcurve + factorisation
2013-09-17 12:44:14 +02:00
Martin Hurton
ad0b325e4a
Merge pull request #665 from hintjens/master
...
Added test case for NULL domains
2013-09-17 01:53:59 -07:00
Pieter Hintjens
7bb2b6ae11
Fixed length of domain setting
2013-09-17 10:04:57 +02:00
Pieter Hintjens
7735ca5f8d
Added test case for NULL domains
2013-09-17 09:48:32 +02:00
Ian Barber
67013f19f6
Merge pull request #664 from hintjens/master
...
NULL mechanism was not dealing with ZAP denials properly
2013-09-16 06:20:21 -07:00
Pieter Hintjens
321a8ffea9
NULL mechanism was not dealing with ZAP denials properly
2013-09-16 15:09:55 +02:00
Ian Barber
971b275f7a
Merge pull request #663 from hintjens/master
...
Fixed random failures in test_security_plain and _curve
2013-09-16 02:04:44 -07:00
Pieter Hintjens
fe9815a789
Fixed random failures in test_security_plain and _curve
...
* ZAP handler thread was not getting time to start up
* Code now creates and binds handler socket in parent thread and
passes the socket to the zap_handler, so this always gets the
authentication requests.
2013-09-16 10:56:49 +02:00
Pieter Hintjens
276cd1f1da
Merge pull request #662 from ricnewton/master
...
Fix windows build
2013-09-16 01:32:55 -07:00
Richard Newton
6f351007d4
Fix windows build
2013-09-16 09:23:47 +01:00
Pieter Hintjens
fbe1b79188
Merge pull request #661 from lalebarde/master
...
simplify test_security_curve.cpp with zmq_z85_encode
2013-09-15 15:36:00 -07:00
Laurent Alebarde
dc1f5e9f7c
simplify test_security_curve.cpp with zmq_z85_encode
2013-09-16 00:06:24 +02:00
Ian Barber
d76f3f7c03
Merge pull request #660 from hintjens/master
...
Added z85 codec to ZMQ API
2013-09-15 11:37:16 -07:00
Pieter Hintjens
576e3ca5e0
Added z85 codec to ZMQ API
...
* Removed redundant Z85 code and include files from project
* Simplified use of headers in test cases (now they all just use testutil.hpp)
* Export zmq_z85_encode() and zmq_z85_decode() in API
* Added man pages for these two functions
2013-09-15 20:13:44 +02:00
Ian Barber
5c7b39275f
Merge pull request #659 from hintjens/master
...
Fixed Z85 methods to be static
2013-09-15 09:51:09 -07:00
Pieter Hintjens
193d0bb634
Fixed Z85 methods to be static and not pollute library
2013-09-15 17:30:18 +02:00
Pieter Hintjens
65ef76bb59
Minor simplification to makefile
2013-09-15 15:45:40 +02:00
Pieter Hintjens
90668517da
Merge pull request #658 from ricnewton/inproc_connect_before_bind
...
Support high water mark on inproc socket connect before bind.
2013-09-15 06:19:00 -07:00
Richard Newton
4e6c56e081
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
2013-09-15 13:36:07 +01:00
Richard Newton
b9298823b4
Set hwm on connect socket before bind has happend to just that of connects hwm.
2013-09-15 13:35:44 +01:00
Richard Newton
7841b0dd0f
Support high water mark on inproc socket connect before bind.
2013-09-14 17:27:18 +01:00
Richard Newton
133c32d5ed
Merge pull request #657 from hintjens/master
...
Build didn't work if libsodium wasn't installed
2013-09-13 00:52:12 -07:00
Pieter Hintjens
0db2bbe29d
Build didn't work if libsodium wasn't installed
2013-09-13 09:47:23 +02:00
Pieter Hintjens
3298e5a206
Merge pull request #656 from ricnewton/inproc_connect_before_bind
...
Allow inproc sockets to connect before bind
2013-09-12 13:46:37 -07:00
Richard Newton
b9c09064d5
Fix whitespace
2013-09-12 21:22:47 +01:00
Richard Newton
d5bd68b60b
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
2013-09-12 21:09:30 +01:00
Richard Newton
379bcb0881
Send identities when connecting pending sockets.
2013-09-12 21:07:29 +01:00
Ian Barber
c1fabf5ca9
Merge pull request #655 from hintjens/master
...
Fixed overwrite in zmq_getsockopt
2013-09-12 10:27:57 -07:00
Richard Newton
7c3496a76a
Fix race condition and support multiple socket connects before bind.
2013-09-12 18:09:37 +01:00
Pieter Hintjens
60f470450d
Merge pull request #654 from lalebarde/master
...
add exhaustive comparison in testutil bounce
2013-09-12 09:53:26 -07:00
Laurent Alebarde
6c84a54388
add exhaustive comparison in testutil bounce
2013-09-12 18:17:31 +02:00
Pieter Hintjens
345bf146f1
Fixed overwrite in zmq_getsockopt
...
On ZMQ_CURVE_xxxKEY fetches, would return 41 bytes into caller's 40-byte
buffer. Now these fetches only return 41 bytes if the caller explicitly
provides a 41-byte buffer (i.e. the option size is 41).
2013-09-12 18:03:23 +02:00