Commit Graph

3450 Commits

Author SHA1 Message Date
Martin Hurton
934560b559 NULL: Implement ERROR handling
NULL mechanism sends ERROR command rather than READY command when ZAP
handler rejects the ZAP request (status code != "200"). The body of
ERROR command contains the status code as returned by ZAP handler.
2014-05-07 16:49:56 +02:00
Pieter Hintjens
61d41156bc Merge pull request #1014 from evoskuil/master
Integrate GSSAPI option in VS UI options and props.
2014-05-07 08:53:18 +02:00
evoskuil
4e5921b7ab Update VS 2008/10/12/13 file distribution. 2014-05-06 15:26:27 -07:00
evoskuil
033040f7e0 Integrate GSSAPI option in VS UI options and props. 2014-05-06 15:23:32 -07:00
evoskuil
17735a4e6b Rename VS version resource file. 2014-05-06 15:21:29 -07:00
evoskuil
b0b6dd4043 Consolidate VS props to shared location. 2014-05-06 15:16:37 -07:00
Pieter Hintjens
4d640fe010 Merge pull request #1012 from hurtonm/master
Update mechanism API so we can check for ERROR status
2014-05-06 17:53:39 +02:00
Martin Hurton
43d8252446 Update gssapi mechanism 2014-05-06 17:49:26 +02:00
Martin Hurton
0be8144176 Update mechanism API so we can check for ERROR status 2014-05-06 17:08:56 +02:00
Pieter Hintjens
8672f3023a Merge pull request #1011 from fichtner/abstract_freebsd_again
ipc: fail harder for abstract ipc on non-Linux
2014-05-05 22:41:09 +02:00
Franco Fichtner
fff29a4a0c ipc: fail harder for abstract ipc on non-Linux
Using 'ipc://@abstract-socket' on non-Linux platforms yields inconsistent
behaviour.  Abstract sockets don't exist, so the literal file is created.
The test previously failed, but for a different reason: this is not the
directory you are looking for.  Now, zmq_bind() will fail for the right
reason: the socket can't be created.  Put the XFAIL back.
2014-05-05 23:26:06 +02:00
Pieter Hintjens
b745455415 Merge pull request #1010 from fichtner/abstract_freebsd
tests: fix abstract ipc test by omitting slashes
2014-05-05 22:14:35 +02:00
Franco Fichtner
69bd470103 tests: fix abstract ipc test by omitting slashes 2014-05-05 23:04:40 +02:00
Pieter Hintjens
4c4ca1f2f6 Merge pull request #1009 from fichtner/gss_freebsd
gssapi: RFC 2744 mandates GSS_C_NT_HOSTBASED_SERVICE
2014-05-05 21:16:38 +02:00
Franco Fichtner
8c09ae6e49 gssapi: RFC 2744 mandates GSS_C_NT_HOSTBASED_SERVICE
Tested on FreeBSD 10.
2014-05-05 22:03:53 +02:00
Pieter Hintjens
40cbbe3c9e Merge pull request #1008 from hurtonm/master
Minor renaming
2014-05-05 20:17:39 +02:00
Martin Hurton
dcd1f2038e Minor renaming 2014-05-05 19:52:53 +02:00
Pieter Hintjens
2c786a200c Merge pull request #1007 from tSed/sma/fork-fix
Build-system: disable test_fork when fork() is not available
2014-05-03 22:01:49 +02:00
Samuel Martin
d178c71e21 cmake: fix indentation 2014-05-03 21:55:03 +02:00
Samuel Martin
c83d4e01dd cmake: tests: disable test_fork if fork() is not available
fork() support is optional and its availability is correctly detected at
contfigure time.

But test_fork was all always built, preventing build for targets that do
not provide fork() from building successfully.

This pacth fixes the CMakeLists.txt on this point.
2014-05-03 21:55:03 +02:00
Samuel Martin
6fdafc458a autotools: tests: disable test_fork if fork() is not available
fork() support is optional and its availability is correctly detected at
contfigure time.

But test_fork was all always built, preventing build for targets that do
not provide fork() from building successfully.

This pacth fixes the autotools on this point.
2014-05-03 21:55:03 +02:00
Pieter Hintjens
87a08e1748 Merge pull request #1006 from hurtonm/master
Remove i_properties interface
2014-05-03 21:15:34 +02:00
Martin Hurton
f2807d11a0 Remove i_properties interface
We use metadata_t directly. No need for generic interface now.
2014-05-03 21:03:49 +02:00
Pieter Hintjens
c5cd92da68 Merge pull request #1005 from ricnewton/master
Initialise _has_src_addr variable, fixes hang on Windows.
2014-05-03 18:31:38 +02:00
Richard Newton
2f08477292 Initialise _has_src_addr variable, fixes hang on Windows. 2014-05-03 13:59:37 +01:00
Martin Hurton
f21116b7be Merge pull request #1003 from hintjens/master
Added test_metadata
2014-05-02 23:20:37 +02:00
Pieter Hintjens
b06474312d ZAP vs. ZMTP metadata priority fixed 2014-05-02 23:14:27 +02:00
Pieter Hintjens
c01365d486 Fixed man page example 2014-05-02 23:13:11 +02:00
Pieter Hintjens
bd4a76cc2a Problem: GSSAPI server doesn't parse ZAP user id
Solution: add this to ZAP reply processing.
2014-05-02 23:12:53 +02:00
Pieter Hintjens
0d13971c05 Fixed compile error in test_security_null 2014-05-02 22:28:19 +02:00
Pieter Hintjens
84ed81c014 Added test_metadata
- also prioritize ZAP metadata over ZMTP metadata in case application
  uses same names.
2014-05-02 22:21:50 +02:00
Ian Barber
dd6c752822 Merge pull request #1001 from hintjens/master
These commits broke regression tests, so I'm reverting them.
2014-05-02 17:46:34 +01:00
Pieter Hintjens
ded00177b3 Revert "Add code to investigate data race"
This reverts commit 5e0facda17.
2014-05-02 16:50:16 +02:00
Pieter Hintjens
d190325e4d Revert "Enlarge the race window for some test cases"
This reverts commit 2a84d25974.

Broke regression test on test_hwm.cpp.
2014-05-02 16:49:03 +02:00
Pieter Hintjens
0bc669b106 Merge pull request #1000 from daveab/feature/divide_by_zero_investigation
Feature/divide by zero investigation
2014-05-02 16:31:48 +02:00
dave b
2a84d25974 Enlarge the race window for some test cases
These changes cause an assertion in lb_sendpipe() when executing the test_security_plain testcase.
2014-05-02 14:32:14 +01:00
dave b
5e0facda17 Add code to investigate data race
Provides control of race windows and logging for some of the interesting transitions.
2014-05-02 14:27:33 +01:00
Pieter Hintjens
2db7cdc6a6 Merge pull request #999 from hurtonm/master
Include ZMTP properties in message metadata
2014-05-02 13:36:38 +02:00
Martin Hurton
8d82cc2a0b Include ZMTP properties in message metadata
Metadata are built in stream_engine now.
This makes it easy to extend metadata with user-defined properties.
2014-05-02 12:45:14 +02:00
Pieter Hintjens
55c06924c8 Merge pull request #998 from hurtonm/master
Don't add empty metadata to received messages
2014-05-02 09:11:55 +02:00
Martin Hurton
e95b477a87 Don't add empty metadata to received messages 2014-05-02 09:02:41 +02:00
Pieter Hintjens
f721a7ad07 Merge pull request #997 from soundart/master
tweetnacl integration for curve
2014-05-01 22:36:42 +02:00
Frank
351c845339 Merge branch 'master' of github.com:soundart/libzmq
Conflicts:
	CMakeLists.txt
2014-05-01 21:39:07 +02:00
Frank
551bcdae6c add metadata 2014-05-01 21:35:53 +02:00
Frank
01afdf8476 no tweetnacl for windows currently 2014-05-01 21:35:36 +02:00
Frank
63cc250d05 typo 2014-05-01 21:30:13 +02:00
Frank
e5a294ec02 tweetnacl integration 2014-05-01 21:30:02 +02:00
Pieter Hintjens
49f18d55cb Merge pull request #996 from hurtonm/master
Add metadata to received messages
2014-05-01 17:52:42 +02:00
Martin Hurton
b9c2748146 Add metadata to received messages 2014-05-01 17:30:51 +02:00
Ian Barber
62bb403eea Merge pull request #995 from hintjens/master
Bumped ABI version to 4.0.0
2014-05-01 15:23:10 +01:00