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

3036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pieter Hintjens
ab9349d3fe Revert "Fix potential memory leak" 
This reverts commit 50d34e5653ade4f3f1623c86f1426aeb746ae564.
 2014-02-11 18:30:08 +01:00
Pieter Hintjens
e376ad2787 Merge pull request #876 from hurtonm/master 
Fix identity handling for inproc transport
 2014-02-09 21:57:49 +01:00
Martin Hurton
a09407829e Fix identity handling for inproc transport 
Fixes #872
 2014-02-09 21:02:00 +01:00
Pieter Hintjens
8cda54c52b Merge pull request #874 from gyulalaszlo/cmake-switchable-tests 
Added ZMQ_BUILD_TESTS to CMakeLists.txt to allow turning off tests.
 2014-02-07 23:53:57 +01:00
Gyula Laszlo
7a86b39d63 Added ZMQ_BUILD_TESTS to CMakeLists.txt to allow turning off tests. Useful when building ZMQ as a git submodule. 2014-02-07 17:50:45 +01:00
Pieter Hintjens
5a47fc4f08 Merge pull request #871 from apyrgio/develop 
Fix potential segfault/memleak
 2014-02-04 08:27:02 -08:00
Alex Pyrgiotis
50d34e5653 Fix potential memory leak 
Delete the socket if the initialization part of the socket creation
fails.
 2014-02-03 18:03:25 +02:00
Alex Pyrgiotis
e6ef16d005 Fix potential segmentation fault 
Call the allocation assertion macro before dereferencing the socket
pointer.
 2014-02-03 17:35:53 +02:00
Richard Newton
0ac223c746 Merge pull request #870 from hintjens/master 
Fixed issue #868
 2014-02-03 03:25:29 -08:00
Pieter Hintjens
4f56631f78 Fixed issue #868 2014-02-03 11:16:49 +01:00
Pieter Hintjens
45b593e7ed Whitespace fix 2014-02-03 11:03:59 +01:00
Pieter Hintjens
40d7ca6a60 Whitespace cleanups 2014-02-03 11:03:59 +01:00
Richard Newton
1fe82ae0a4 Merge pull request #866 from hintjens/master 
Fixed issue #865 - validation on ZMQ_TCP_KEEPALIVE
 2014-01-31 03:14:08 -08:00
Pieter Hintjens
bb81b1e3d9 Fixed issue #865 - validation on ZMQ_TCP_KEEPALIVE 2014-01-31 12:03:15 +01:00
Pieter Hintjens
365b7b8d20 Merge pull request #864 from ricnewton/master 
Fix cmake build
 2014-01-31 02:26:16 -08:00
Richard Newton
0b9a9f7671 Fix cmake build 2014-01-30 13:21:20 +00:00
Richard Newton
6cd86932c5 Merge pull request #863 from hintjens/master 
Test for 127.0.0.1 at tests startup
 2014-01-30 05:00:53 -08:00
Pieter Hintjens
046e37e907 Test for 127.0.0.1 at tests startup 2014-01-29 20:16:58 +01:00
Martin Hurton
de96d65f15 Merge pull request #862 from hintjens/master 
Fixed man page for zmq_proxy_hook
 2014-01-29 06:34:13 -08:00
Pieter Hintjens
fa318400dc Fixed man page for zmq_proxy_hook 
- spaces instead of tabs for indentation
- fixed levels under EXAMPLE USAGE
- added to Makefile.am
 2014-01-29 15:15:29 +01:00
Martin Hurton
e45fddc2bc Merge pull request #861 from pavel-pimenov/master 
[libzmq] const string p -> const string& p (#860)
 2014-01-29 05:59:52 -08:00