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

3079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Newton
b31ea51ca0 Merge pull request #931 from Dahko/patch-1 
Fixed wrong assert in zmq_recv
 2014-03-17 13:48:32 +00:00
Dahko
6a627acea7 Fixed wrong assert in zmq_recv 
zmq_recv returns bytes count, not error code, so 'assert (rc==0)' behaved completely wrong
 2014-03-17 16:38:19 +03:00
Ian Barber
5ced51b753 Merge pull request #930 from ricnewton/master 
Add delays in test_connect_rid
 2014-03-17 13:23:04 +00:00
Richard Newton
e27a610897 Fix tabs 2014-03-17 12:32:21 +00:00
Richard Newton
26dc643205 Add delays in test_connect_rid to allow time for socket to close before address reuse. 2014-03-17 12:24:52 +00:00
Pieter Hintjens
be6763e381 Merge pull request #928 from bebopagogo/master 
fixed another missed norm_engine issue for non-norm build
 2014-03-16 17:40:33 +01:00
Pieter Hintjens
e9523a98b5 Merge pull request #927 from ricnewton/master 
Fix cmake build on windows & travis build.
 2014-03-16 17:40:21 +01:00
bebopagogo
43071bc724 fixed another missed norm_engine issue for non-norm build 2014-03-16 12:31:19 -04:00
Richard Newton
5bd5188ec6 Fix tabs 2014-03-16 16:18:30 +00:00
Richard Newton
7cead2bfd6 Fix travis build. 2014-03-16 16:15:19 +00:00
Richard Newton
a4b0e93fc1 Fix travis build. 2014-03-16 16:01:47 +00:00
Richard Newton
05229ea673 Fix cmake build on windows. 2014-03-16 15:59:50 +00:00
Richard Newton
0e0c46aedc Merge pull request #926 from bebopagogo/master 
added uncommitted norm_engine changes
 2014-03-16 15:55:47 +00:00
bebopagogo
d3e0be1528 added uncommitted norm_engine changes 2014-03-16 09:15:31 -04:00
Ian Barber
0514aa5b51 Merge pull request #925 from hintjens/master 
Fixed comment
 2014-03-16 11:07:20 +00:00
Pieter Hintjens
b433adf49e Fixed comment 2014-03-16 11:53:40 +01:00
Pieter Hintjens
74d344ca74 Merge pull request #924 from bebopagogo/master 
NORM protocol extension
 2014-03-16 09:33:59 +01:00
bebopagogo
33f22d0d04 added norm_engine 2014-03-15 10:48:12 -04:00
bebopagogo
c91a638a5a added norm_engine 2014-03-15 10:46:21 -04:00
Ian Barber
72c02b1569 Merge pull request #923 from hintjens/master 
Revert "Fixed potential SEGFAULT."
 2014-03-14 15:06:04 +00:00
Pieter Hintjens
b1e74f79c4 Revert "Fixed potential SEGFAULT." 
This reverts commit 79b81f48402c1276d4cfd3bf0cbfb4084952b36b.
Was causing:

Assertion failed: destroyed (socket_base.cpp:154)
/bin/bash: line 5: 31344 Aborted                 ${dir}$tst
FAIL: test_many_sockets

On TravisCI.
 2014-03-14 09:39:56 +01:00
Pieter Hintjens
a5e397a55e Merge pull request #922 from horus42/master 
Fixed potential SEGFAULT in socket_base.cpp
 2014-03-13 12:46:09 +01:00
czach
03a3dd2503 Merge remote-tracking branch 'upstream/master' 2014-03-13 11:11:17 +01:00
czach
79b81f4840 Fixed potential SEGFAULT. 2014-03-13 11:05:50 +01:00
Pieter Hintjens
49e035fb40 Merge pull request #921 from mbarbisan/master 
Allow TCP addresses to be re-resolved whenever there is a reconnection a...
 2014-03-12 18:36:13 +01:00
Mark Barbisan
350a1ac12b Allow TCP addresses to be re-resolved whenever there is a reconnection attempt 2014-03-12 13:28:37 -04:00
Pieter Hintjens
4e5f866fa4 Merge pull request #920 from mbarbisan/master 
Add the tag name to the zmq_pollitem_t struct to allow easier forward de...
 2014-03-12 15:28:31 +01:00
Mark Barbisan
52db50f844 Add the tag name to the zmq_pollitem_t struct to allow easier forward declaration 2014-03-12 10:11:12 -04:00
Pieter Hintjens
e224be25dc Merge pull request #914 from drewcrawford/issue_912 
Libsodium is now required if and only if --with-libsodium is used
 2014-03-10 21:06:06 +01:00
Drew Crawford
6009e2c6c4 Libsodium is now required if and only if --with-libsodium is used 
This patch is proposed for https://github.com/zeromq/libzmq/issues/912.  If a user specifies that they want libzmq built with libsodium, and the requirement cannot be satisfied, we should error at the user so they can either A) install libsodium to a reasonable location or B) relax their requirement for libsodium support.

Previously a warning was issued in this case, causing users who wanted libsodium support not to get it, which may be discovered at a much later time when their programs didn't work as expected.

I release this patch under the LGPL v3 or any later version.
 2014-03-10 13:59:33 -05:00
Pieter Hintjens
b63c5e5469 Merge pull request #911 from KennethWilke/master 
Minor change to zmq_curve_keypair doc
 2014-03-06 23:16:05 +01:00
KennethWilke
2bcf860e77 Minor change to zmq_curve_keypair doc 2014-03-06 15:18:42 -06:00
Ian Barber
bf08114be4 Merge pull request #910 from hintjens/master 
Added scaffolding for zmq_msg_gets
 2014-03-03 19:08:43 -08:00
Pieter Hintjens
305a1442ae Added scaffolding for zmq_msg_gets 2014-03-03 13:19:40 +01:00
Pieter Hintjens
8de07ad79b Merge pull request #906 from olafmandel/fix_msvc8_build 
Fix MSVC8 build
 2014-02-25 17:21:05 +01:00
Olaf Mandel
e7a0c54876 Fix MSVC8 build 
The extra semicolons were introduced in 48b50ce together with the
defintion of the ZMQ_USE_SELECT macros.
 2014-02-25 15:11:24 +01:00
Pieter Hintjens
b008a341d7 Merge pull request #905 from guruofquality/missing_librt 
add linking to librt under cmake build - fixes missing symbol
 2014-02-24 20:17:59 +01:00
Josh Blum
2bc3c82745 add linking to librt under cmake build - fixes missing symbol 
The libzmq library itself uses clock_gettime and should link w/ -lrt on linux.
Caught this issue on on Ubuntu 12.04 LTS.
 2014-02-24 11:07:28 -08:00
Pieter Hintjens
176d2c8a67 Merge pull request #904 from olafmandel/zmq-socket.man 
Fix zmq_socket example in documentation
 2014-02-24 19:06:42 +01:00
Olaf Mandel
45dfbc5248 Fix zmq_socket example in documentation 
Issues adressed:
 - The actual data was never read from the socket, causing all even
   numbered loop iterations to fail
 - The socket variable was called server once
 2014-02-24 18:27:03 +01:00
Pieter Hintjens
8b7ac4ffdc Merge pull request #902 from pavel-pimenov/fix-pvs-studio-v547 
Fix build with ZMQ_HAVE_WINDOWS (typedef UINT_PTR fd_t; -> unsigned type...
 2014-02-21 11:02:20 +01:00
Pavel Pimenov
acfbfe53bc Fix build with ZMQ_HAVE_WINDOWS (typedef UINT_PTR fd_t; -> unsigned type) 
V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 845
  V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 863
  V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 897
  http://www.viva64.com/en/d/0137/print/
 2014-02-21 13:22:53 +04:00
Pieter Hintjens
88ed56fa9d Merge pull request #901 from pijyoi/master 
workaround missing Mstcpip.h in mingw32
 2014-02-18 15:19:41 +01:00
KIU Shueng Chuan
acf0949f18 workaround missing Mstcpip.h in mingw32 2014-02-18 21:24:24 +08:00
Pieter Hintjens
3b8254daed Merge pull request #900 from pijyoi/master 
fix: win32 tcp_keepalive gets set even when option is -1
 2014-02-18 08:49:39 +01:00
KIU Shueng Chuan
9d3d9d635a fix: win32 tcp_keepalive gets set even when option is -1 2014-02-18 14:17:32 +08:00
Pieter Hintjens
1879b8ba76 Merge pull request #899 from olafmandel/duplicate_poller_detect 
Remove duplicate poller decision making
 2014-02-17 16:07:31 +01:00
Olaf Mandel
48b50cefb4 Remove duplicate poller decision making 
The decision about the poller mechanism to use (select, poll, ...)
was done twice: once by the build system and once by the code in
poller.hpp. As the build-system can actually detect the mechanisms
available, prefer that result to the hard coded defaults in
poller.hpp.

At the same time, remove the duplicate detection of select() vs.
poll()-variant from proxy.cpp, signaler.cpp and zmq.cpp.

This patch has not been tested on many build platforms: especially
the cmake build needs testing / patching. For the other builds,
hard code the result as these these are all Windows platforms.
 2014-02-17 14:08:11 +01:00
Ian Barber
f789177abe Merge pull request #898 from hintjens/master 
Added temporary CURVE debugging support
 2014-02-17 11:18:51 +00:00
Pieter Hintjens
8cca4735d8 Added temporary CURVE debugging support 
- just prints server-side failures to console
- can be improved over time, e.g. enabled at build time or
  sent to inproc debug channel
 2014-02-16 20:19:46 +01:00