3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-03 03:45:43 +08:00
Code Issues Projects Releases Wiki Activity
3,849 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

3849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Telford Berkey
920371ee6b Corrected installer source path for VS pdb debug symbols file. Removed prefix path to platform.h 2014-06-04 08:47:22 -04:00
Martin Hurton
8e7a8a43b4 Merge pull request #1070 from ricnewton/master 
Fix for issue https://github.com/zeromq/libzmq/issues/1065
 2014-06-04 13:38:29 +02:00
Richard Newton
c9e86acf61 Set up hwm's before we connect the other end of the pipe in ctx_t::connect_inproc_sockets 2014-06-04 12:13:15 +01:00
evoskuil
6af46c39c7 Update VS import props to allow delinking by dependent projects. 2014-06-04 01:26:39 -07:00
evoskuil
4a02604cc2 Reset PDB out path change in base VS props. 2014-06-04 01:25:41 -07:00
Ian Barber
764a3495c6 Merge pull request #1067 from hintjens/master 
Problem: email addresses in AUTHORS harvested for spam
 2014-06-03 11:10:02 +01:00
Pieter Hintjens
ff07d85594 Problem: email addresses in AUTHORS harvested for spam 
Solution: remove these email addresses, since authors are reachable
via their Git commit history.
 2014-06-03 12:00:37 +02:00
Pieter Hintjens
b42b9c9d67 Merge pull request #1066 from hurtonm/master 
Style fixes
 2014-06-03 11:25:25 +02:00
Martin Hurton
f447386936 Style fixes 2014-06-03 10:42:29 +02:00
Pieter Hintjens
c6e38ec1b7 Merge pull request #1064 from evoskuil/master 
cosmetic msvc xml fix
 2014-06-03 07:31:53 +02:00
Pieter Hintjens
77f50f9ab8 Merge pull request #1061 from dmeehan1968/fix-perf-platform-hpp-windows 
Fix for perf/platform.hpp not being cleaned up by distclean
 2014-05-31 16:11:49 +02:00
Dave Meehan
451c94af8e Fix for perf/platform.hpp not being cleaned up by distclean 2014-05-31 13:51:41 +01:00
Pieter Hintjens
b118acb710 Merge pull request #1059 from dmeehan1968/msvc-pdb-output 
Added ProgramDataBaseFile directive
 2014-05-30 19:05:43 +02:00
Dave Meehan
ed49057fd7 Added ProgramDataBaseFile directive so that .pdb file goes into same directory as the .lib so that debug builds can find it 2014-05-30 17:47:01 +01:00
evoskuil
d456e70d7d cosmetic msvc xml fix 2014-05-26 21:16:43 -07:00
Pieter Hintjens
cfc754f393 Merge pull request #1020 from jemc/inproc_simult 
Add failing test reproducing issue #1015.
 2014-05-23 16:03:15 +02:00
Pieter Hintjens
ac244b41c5 Merge pull request #1057 from hurtonm/master 
Add const qualifier to register_endpoint param
 2014-05-23 14:29:38 +02:00
Martin Hurton
dd2be381ad Add const qualifier to register_endpoint param 2014-05-23 12:27:01 +02:00
Joe Eli McIlvain
8b47d36875 Revert "Mark failing test for issue #1015 as XFAIL" 
This reverts commit b6c577a9ecaa3d20b82baf704a90e5555f850be9.
 2014-05-22 12:21:32 -07:00
Pieter Hintjens
99dba23dc7 Merge pull request #1055 from hurtonm/master 
Fix race condition in connecting inproc sockets
 2014-05-22 10:40:38 +02:00
Martin Hurton
3901d94b27 Fix race condition in connecting inproc sockets 2014-05-22 09:09:45 +02:00
Pieter Hintjens
313b2ec84e Merge pull request #1054 from evoskuil/master 
Minor updates to VS build configuration and NuGet packaging.
 2014-05-21 16:53:40 +02:00
Pieter Hintjens
77514e0e9f Merge pull request #1053 from hurtonm/master 
Code cleanup
 2014-05-21 14:24:36 +02:00
Martin Hurton
414fc86b22 Code cleanup 
- limit visibility of pending_connection_t
- add const qualifiers
 2014-05-21 13:08:15 +02:00
evoskuil
be99f060b3 Update NuGet packaging. 2014-05-21 01:35:52 -07:00
evoskuil
c0c89a3bc5 Update VS version resource and package version. 2014-05-21 01:35:34 -07:00
evoskuil
51c1a1c408 Generalize dependency reference in GSL config/script. 2014-05-21 00:14:09 -07:00
evoskuil
0c60256727 Revert change to VS props references because of VS UI limitation. 2014-05-21 00:13:43 -07:00
Pieter Hintjens
96501d7271 Merge pull request #1051 from hurtonm/master 
Small code cleanup
 2014-05-20 22:20:57 +02:00
Martin Hurton
5f4145e7cb Small code cleanup 
- add const modifier to address parameter of event generating functions
 2014-05-20 21:48:59 +02:00
Martin Hurton
6bdedcbca3 Merge pull request #1049 from hintjens/master 
Minor fixes
 2014-05-20 16:12:38 +02:00
Pieter Hintjens
4b67919f93 Minor trim of man page title 2014-05-20 15:42:35 +02:00
Pieter Hintjens
11175a33f1 Problem: security tests block on zmq_send 
The expect_bounce_fail () helper assumed that messages could always
be sent. However in some cases zmq_send() blocks, due to there not
being any outgoing pipe. This changed in 77f5f7, where previously
there would be a pipe that kept trying to reconnect forever.

Solution: use a send timeout and check for EAGAIN if sending failed.
 2014-05-20 15:42:35 +02:00
Pieter Hintjens
a1fbd97330 Merge pull request #1048 from hurtonm/master 
PLAIN: Small simplification
 2014-05-19 21:04:40 +02:00
Martin Hurton
32b3daad7e PLAIN: Small simplification 2014-05-19 20:45:42 +02:00
Pieter Hintjens
155feccb3f Merge pull request #1047 from mrvn/pull-testutil-expect_bounce_fail-send-timeout 
Add a send timeout in expect_bounce_fail()
 2014-05-19 17:52:27 +02:00
Pieter Hintjens
11357df0e0 Merge pull request #1046 from mrvn/pull-testutil-set-alarm 
Set an alarm(60) in setup_test_environment() when not on windows so test...
 2014-05-19 17:51:42 +02:00
Goswin von Brederlow
2ba5af6d83 Set an alarm(60) in setup_test_environment() when not on windows so tests 
will not block too long if they go wrong.
 2014-05-19 17:03:41 +02:00
Goswin von Brederlow
0ebf94e429 Add a send timeout in expect_bounce_fail() so tests for authentication 
failures don't block.
 2014-05-19 17:03:24 +02:00
Pieter Hintjens
77f5f7adae Merge pull request #1043 from hurtonm/dont_reconnect_on_protocol_errors 
Don't reconnect on protocol errors
 2014-05-18 10:53:32 +02:00
Pieter Hintjens
de639c34ae Merge pull request #1042 from hurtonm/master 
Fix bug in reporting protocol errors
 2014-05-18 10:09:38 +02:00
Martin Hurton
045dab91a5 Merge pull request #1037 from hintjens/master 
Problem: artificial restriction on binary identities
 2014-05-18 09:14:06 +02:00
Martin Hurton
9a53f334d2 Don't reconnect on protocol errors 2014-05-18 08:49:29 +02:00
Martin Hurton
ed076d4620 Fix bug in reporting protocol errors 2014-05-18 08:30:40 +02:00
Pieter Hintjens
bac001cc85 Merge pull request #1041 from hurtonm/master 
Tell the session why the engine has stopped
 2014-05-18 00:21:22 +02:00
Martin Hurton
7d3fa3afcb Tell the session why the engine has stopped 2014-05-17 21:04:38 +02:00
Pieter Hintjens
a9a15ccf6f Use different endpoint for each test step 2014-05-16 16:00:37 +02:00
Pieter Hintjens
aad54b2a8b Whitespace fixes 2014-05-16 16:00:37 +02:00
Pieter Hintjens
a178097f95 Problem: artificial restriction on binary identities 
Applications that use ZMQ_IDENTITY can be trapped by the artificial
restriction on not using a binary zero as first byte. It's specially
nasty on random generated identities, e.g. UUIDs, as the chance of a
binary zero is low, so it will pass 255 out of 256 times.

Solution: remove the restriction.
 2014-05-16 16:00:37 +02:00
Pieter Hintjens
adddda17cf Merge pull request #1038 from hurtonm/master 
CURVE: Implement server-side ERROR handling
 2014-05-16 07:54:21 +02:00
Martin Hurton
bd73119e2b CURVE: Implement server-side ERROR handling 2014-05-16 07:25:29 +02:00
Pieter Hintjens
4f571edf1b Merge pull request #1036 from hurtonm/master 
CURVE: Implement client-side ERROR handling
 2014-05-15 07:15:41 +02:00
Martin Hurton
0750303bfe CURVE: Implement client-side ERROR handling 2014-05-15 06:39:45 +02:00
Pieter Hintjens
0975be6ed7 Merge pull request #1035 from hurtonm/master 
Prefix error-reason with length in ERROR command
 2014-05-14 14:16:26 +02:00
Martin Hurton
410f891599 Prefix error-reason with length in ERROR command 2014-05-14 14:13:13 +02:00
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