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,107 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

3107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pieter Hintjens
0be4a92d20 Merge pull request #895 from olafmandel/LIBZMQ_CHECK_POLLER 
Clarify configure messages for --with-poller=...
 2014-02-14 22:48:51 +01:00
Pieter Hintjens
a838b3897b Merge pull request #894 from olafmandel/Cygwin_gitignore 
Update .gitignore to exclude *.exe under Cygwin
 2014-02-14 20:41:54 +01:00
Olaf Mandel
d9d73e4bf9 Clarify configure messages for --with-poller=... 2014-02-14 14:40:51 +01:00
Olaf Mandel
f1ba66a78b Update .gitignore to exclude *.exe under Cygwin 2014-02-14 14:37:45 +01:00
Pieter Hintjens
ba5fcc95eb Merge pull request #892 from olafmandel/ZMQ_SOCKET_LIMIT 
Rename ZMQ_MAX_SOCKETS_MAX to ZMQ_SOCKET_LIMIT
 2014-02-14 10:15:57 +01:00
Olaf Mandel
e41c8cba0e Rename ZMQ_MAX_SOCKETS_MAX to ZMQ_SOCKET_LIMIT 
As per suggestion by Pieter Hintjens. Also update wording in
zmq_ctx_set manual a bit.
 2014-02-14 10:09:19 +01:00
Pieter Hintjens
1e9ea54bf6 Merge pull request #889 from olafmandel/MAX_SOCKETS_MAX 
Add ZMQ_MAX_SOCKETS_MAX to zmq_ctx_get()
 2014-02-13 19:15:01 +01:00
Pieter Hintjens
af42d439cd Merge pull request #890 from brunoqc/880 
Fix a strict-aliasing with type-punning
 2014-02-13 19:13:04 +01:00
Pieter Hintjens
a6e05ad5a3 Merge pull request #891 from lalebarde/master 
Reverse zmq_proxy_chain and zmq_proxy_hook
 2014-02-13 19:12:46 +01:00
Laurent Alebarde
3fb800c100 fix revert 2014-02-13 18:52:15 +01:00
Laurent Alebarde
abf9d8b74e Revert "add a proxy hook" 
This reverts commit 9ae6a91fadb96fd48038fde04cc3d4b61b49a8a1.
 2014-02-13 18:35:09 +01:00
Laurent Alebarde
bc25366f7c Revert "add proxy_chain, a multi proxies chaining in the same thread feature" 
This reverts commit bc7441f5176589ad9a34dc2bde6b91d78a44e3e0.
 2014-02-13 18:35:09 +01:00
Bruno Bigras
e8a13c44b0 Fix a strict-aliasing with type-punning 
Fixes #880
 2014-02-13 12:06:10 -05:00
Olaf Mandel
5815b768b9 Add ZMQ_MAX_SOCKETS_MAX to zmq_ctx_get() 
The new options allows querying the maximum allowed number of sockets.
This is system dependent and cannot be encoded in the include file as a
preprocessor macro: for ZMQ_USE_SELECT, this depends on the FD_SETSIZE
macro at time of library compilation, not at time of include file use.
 2014-02-13 15:54:06 +01:00
Pieter Hintjens
b54a168d41 Merge pull request #884 from guruofquality/cmake_fixes 
fix libzmq.pc generation under cmake
 2014-02-13 11:36:51 +01:00
Pieter Hintjens
c7ffef37bc Merge pull request #886 from guruofquality/auto_fixes 
fix autotools out of tree build link issue on linux
 2014-02-13 10:03:55 +01:00
Pieter Hintjens
1737520c67 Merge pull request #887 from ricnewton/master 
Fix hang on terminate when inproc is connected but never bound.
 2014-02-13 09:31:43 +01:00
Richard Newton
12442a3d65 Bind pending connections on terminate outside lock. 2014-02-12 23:45:39 +00:00
Richard Newton
668c42fc26 Fix hang on term when inproc is connected but never bound. 2014-02-12 23:10:23 +00:00
Josh Blum
a5741ea2f5 fix autotools out of tree build link issue on linux 
added srcdir to --version-script=$(srcdir)/libzmq.vers
 2014-02-12 11:22:37 -08:00
Josh Blum
b1471da5ac fix libzmq.pc generation under cmake 
The ${libdir} was getting replaced/removed by configure_file() making pkg-config give bad flags: -L -lzmq
My fix was to add @ONLY to configure_file() so ${} style pkg-config substitutions are left alone.
In addition, I put the other typical ${} substitutions back into the libzmq.pc, since its now safe.
 2014-02-11 15:46:38 -08:00
Ian Barber
6150812ff1 Merge pull request #881 from hintjens/master 
Revert "Fix potential memory leak"
 2014-02-11 17:38:23 +00:00