Pieter Hintjens
6dbc70516c
Merge pull request #1034 from hurtonm/master
...
NULL: Correct ERROR command format
2014-05-14 07:13:00 +02:00
Martin Hurton
dd6a4fe806
NULL: Correct ERROR command format
2014-05-14 06:52:55 +02:00
Pieter Hintjens
2ff098f6ae
Merge pull request #1033 from hurtonm/master
...
Finish ERROR handling for PLAIN mechanism
2014-05-14 06:45:43 +02:00
Martin Hurton
164ff4be6b
Remove debugging output
2014-05-14 06:35:08 +02:00
Martin Hurton
57546f4ecb
PLAIN: Implement ERROR handling in server
2014-05-14 06:23:47 +02:00
Martin Hurton
8651b55797
PLAIN: Fix parsing of ERROR command
2014-05-14 06:23:47 +02:00
Pieter Hintjens
3338c76bac
Merge pull request #1032 from hurtonm/master
...
PLAIN: Implement ERROR handling in client
2014-05-13 19:14:36 +02:00
Martin Hurton
6b8513744c
PLAIN: Implement ERROR handling in client
2014-05-13 18:34:48 +02:00
Pieter Hintjens
8c4e049564
Merge pull request #1031 from sdrsdr/identity_fd
...
test case for zmq_getsockopt/ZMQ_IDENTITY_FD
2014-05-13 14:24:29 +02:00
Stoian Ivanov
14e8e8af33
Merge branch 'master' of https://github.com/zeromq/libzmq into identity_fd
2014-05-13 15:21:02 +03:00
Stoian Ivanov
6f5e7714cf
test case for zmq_getsockopt/ZMQ_IDENTITY_FD
2014-05-13 15:19:48 +03:00
Pieter Hintjens
c6dec22717
Merge pull request #1030 from evoskuil/master
...
Simplify VS project configs and harden MSBUILD script
2014-05-13 12:31:51 +02:00
evoskuil
3aa6c1eab0
Optimize VS projects and common props.
2014-05-13 03:17:48 -07:00
evoskuil
7e7508a8d9
Harden MSBUILD base script against various VS installations.
2014-05-13 03:17:34 -07:00
Pieter Hintjens
09b17c13c2
Merge pull request #1029 from olafmandel/master
...
Update cmake, mingw32 and msvc builds
2014-05-12 14:50:34 +02:00
Olaf Mandel
c5cca55c78
Update build files to include metadata
...
This became necessary after b9c274814
2014-05-12 13:19:12 +02:00
Olaf Mandel
d58dfa4944
Update build files after plain_mechanism split
...
This became necessary after 22d6a9740
2014-05-12 13:00:27 +02:00
Pieter Hintjens
ec0094c474
Merge pull request #1027 from evoskuil/master
...
Batched VS builds, updated libsodium imports
2014-05-12 11:45:22 +02:00
evoskuil
bf169024b3
Batched VS builds.
2014-05-12 02:17:08 -07:00
evoskuil
5ab44f4874
Ignore error on concurrent file copy in parallel VS builds.
2014-05-12 02:13:47 -07:00
evoskuil
249a59a519
Updated libsodium imports.
2014-05-12 02:12:27 -07:00
Pieter Hintjens
dde45a98a6
Merge pull request #1026 from sdrsdr/identity_fd
...
Documentation for ZMQ_IDENTITY_FD sockopt
2014-05-12 11:00:02 +02:00
Pieter Hintjens
1d5bc80372
Merge pull request #1025 from ricnewton/master
...
Update cmake for split of plain_mechanism
2014-05-12 10:59:44 +02:00
Stoian Ivanov
3d05df9aa5
Merge remote-tracking branch 'upstr/master' into identity_fd
2014-05-12 11:15:10 +03:00
Stoian Ivanov
a16d3dbb0e
docu
2014-05-12 11:02:44 +03:00
Richard Newton
3f479f534e
Merge pull request #1024 from sdrsdr/identity_fd
...
Implement ZMQ_IDENTITY_FD sock option for linking socket identity to FD
2014-05-12 08:53:48 +01:00
Richard Newton
1c4cea6c7f
Update cmake for split of plain_mechanism
2014-05-12 08:51:13 +01:00
Stoian Ivanov
8fcefed43f
patch cleanup
2014-05-12 10:40:24 +03:00
Stoian Ivanov
d5991d6728
merge to upstream
2014-05-12 10:24:31 +03:00
Pieter Hintjens
098d01b16f
Merge pull request #1023 from hurtonm/master
...
Split plain_mechanism into client and server part
2014-05-12 07:16:38 +02:00
Martin Hurton
22d6a97403
Split plain_mechanism into client and server part
2014-05-12 06:10:56 +02:00
Pieter Hintjens
17cb14f79d
Merge pull request #1022 from danielhtshih/master
...
add untracked test_stream_timeout into .gitignore and tests/Makefile.am
2014-05-11 18:02:16 +02:00
Daniel Shih
70b6516d96
add untracked test_stream_timeout into .gitignore and tests/Makefile.am
2014-05-11 23:46:51 +08:00
Stoian Ivanov
acb71e0096
store also here!
2014-05-10 14:06:37 +03:00
Joe Eli McIlvain
b6c577a9ec
Mark failing test for issue #1015 as XFAIL
2014-05-09 14:06:17 -07:00
Joe Eli McIlvain
5cf74db6bb
Add failing test reproducing issue #1015 .
...
There is a race condition when connect and bind on a new inproc
endpoint happen "simultaneously" in threads. Causes the error:
Assertion failed: ok (ctx.cpp:474)
2014-05-09 11:02:01 -07:00
Pieter Hintjens
7ec7f70384
Merge pull request #1019 from willstrang/master
...
Issue #1017 : add ZMQ_HANDSHAKE_IVL time limit on connection handshake
2014-05-09 17:01:07 +02:00
Will Strang
afe5fd87e9
Issue #1017 : add ZMQ_HANDSHAKE_IVL time limit on connection handshake
2014-05-09 13:54:24 +00:00
Pieter Hintjens
1cf12ee612
Merge pull request #1018 from soundart/master
...
curve: initialize crypto libs before usage
2014-05-09 09:18:54 +02:00
Frank
b846f3075c
ws
2014-05-09 00:07:02 +02:00
Frank
8962b7de45
removed return code check for now, got -1 in test_security_curve.
2014-05-09 00:04:20 +02:00
Frank
05ab9a848f
find libsodium with cmake
2014-05-09 00:04:19 +02:00
Frank
2cdfa1fff3
initialize libsodium and tweetnacl
2014-05-09 00:04:19 +02:00
Pieter Hintjens
ba22eff6b4
Merge pull request #1016 from hurtonm/master
...
NULL: Implement ERROR handling
2014-05-07 16:58:50 +02:00
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
