Commit Graph

4061 Commits

Author SHA1 Message Date
Constantin Rack
de018e8766 Merge pull request #1522 from reza-ebrahimi/master
fixed issue with ticket #1517 (wrong lib output name in MSVC CMake bu…
2015-08-14 16:13:41 +02:00
reza.ebrahimi
a50834cbec fixed issue with ticket #1517 (wrong lib output name in MSVC CMake build) and apply some improvements in CMake build system 2015-08-14 18:04:54 +04:30
Constantin Rack
eb2eec646f Merge pull request #1521 from reza-ebrahimi/master
changing some camelCase variable names to snake_case in previous commit
2015-08-14 14:42:54 +02:00
reza.ebrahimi
8e6ef4616e changing some camelCase variable names to snake_case in previous commit 2015-08-14 16:56:07 +04:30
Constantin Rack
003ae1bfc6 Merge pull request #1520 from reza-ebrahimi/master
remove unnecessary multiple WSAGetLastError() calls
2015-08-14 14:14:04 +02:00
reza.ebrahimi
d7b74d1f57 remove unnecessary multiple WSAGetLastError() calls 2015-08-14 16:29:18 +04:30
Constantin Rack
6d217aa919 Merge pull request #1519 from reza-ebrahimi/master
place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro
2015-08-14 13:28:53 +02:00
reza.ebrahimi
bff2284a50 place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro 2015-08-14 15:40:39 +04:30
Constantin Rack
bf27d58b7a Merge pull request #1518 from sappo/master
Problem: Missing src/ prefix for libzmq library in Makefile.am ...
2015-08-13 08:51:45 +02:00
sappo
8bf4d1eaaf Problem: Missing src/ prefix for libzmq library in Makefile.am for test_getsockopt_memset
Solution: Add prefix to fix test compilation
2015-08-13 07:13:00 +02:00
Constantin Rack
effc26c695 Merge pull request #1476 from hintjens/master
Problem: lack test case for large stream messages
2015-08-12 10:03:45 +02:00
Constantin Rack
08c2a9274e Merge pull request #1514 from rikvdh/master
Merge fix for zeromq/zeromq4-1#52, getsockopt ZMQ_RCVMORE now resets all bits
2015-08-11 23:30:59 +02:00
Constantin Rack
de55e3a355 Merge pull request #1515 from rikvdh/test-proxy-return
Check proxy return values in tests
2015-08-11 23:30:22 +02:00
Rik van der Heijden
5485d6e371 Check proxy return values in tests 2015-08-11 21:44:41 +02:00
Rik van der Heijden
c68e9a39bf Merge fix for zeromq/zeromq4-1#52, getsockopt ZMQ_RCVMORE now resets all bits 2015-08-11 21:37:50 +02:00
Pieter Hintjens
fd9bd1b2a5 Problem: broke Cmake build 2015-08-11 19:35:48 +02:00
Pieter Hintjens
5d5cdac161 Problem: source packages lack makefiles for all systems except msvc
Solution: specify the necessary EXTRA_DIST

I added a Makefile.am in builds that covers all systems except msvc,
which already has a Makefile.am that does this.

Fixes #1505
2015-08-11 19:34:25 +02:00
Pieter Hintjens
2b45e38b7b Problem: documentation for ZMQ_CTX_BLOCKY is wrong
Solution: fix it. Default is true, not false.
2015-08-11 19:34:25 +02:00
Pieter Hintjens
11fba2b813 Fixed compile errors in test_stream 2015-08-11 19:34:25 +02:00
Pieter Hintjens
92c4decb69 Problem: lack test case for large stream messages
Solution: added to test_stream.cpp
2015-08-11 19:34:25 +02:00
Constantin Rack
b791031423 Merge pull request #1512 from pijyoi/retransmit_fix
fix: ZMQ_TCP_RETRANSMIT_TIMEOUT not applied to bind socket
2015-08-07 10:02:52 +02:00
KIU Shueng Chuan
e129640471 fix: ZMQ_TCP_RETRANSMIT_TIMEOUT not applied to bind socket 2015-08-07 06:43:31 +08:00
Constantin Rack
84a93d4251 Merge pull request #1511 from sorenh/linger_fix
Avoid terminating connections prematurely
2015-08-06 20:45:45 +02:00
Soren Hansen
abc845d1af Avoid terminating connections prematurely
While sending very large messages (far beyond what fits in a the tcp
buffer, so it takes multiple sendto system calls for it to finish),
zmq_close will close the connection regardless of ZMQ_LINGER.

In case no engine is attached, a pipe->check_read() is needed to look
for the delimiter in the pipe and ultimately trigger the pipe
termination.

However, if there *is* an engine attached, the check_read() looks ahead
and finds the delimiter and terminates the connection even though the
engine might actually still be in the middle of sending a message.

This happens because while the io_thread is still busy sending the data,
the pipe can get terminated and the io thread ends up being terminated.
2015-08-06 20:09:37 +02:00
Richard Newton
ba6e1337a3 Merge pull request #1510 from pijyoi/retransmit_timeout
add ZMQ_TCP_RETRANSMIT_TIMEOUT socket option
2015-08-06 17:26:13 +01:00
KIU Shueng Chuan
c7f2cdd699 fix: Windows setsockopt needs char* cast 2015-08-07 00:05:13 +08:00
KIU Shueng Chuan
ca9215de1e add ZMQ_TCP_RETRANSMIT_TIMEOUT socket option 2015-08-06 23:36:27 +08:00
Constantin Rack
064c2e0836 Merge pull request #1508 from pijyoi/connect_timeout
add ZMQ_CONNECT_TIMEOUT option
2015-08-04 16:54:56 +02:00
KIU Shueng Chuan
c9971e08a0 write man pages 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
eeb697b5ac add connect timeout logic 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
c0ca2be642 add ZMQ_CONNECT_TIMEOUT socket option 2015-08-04 22:17:02 +08:00
KIU Shueng Chuan
4a0bde8130 rename timer_started to reconnect_timer_started 2015-08-04 22:17:02 +08:00
KAPP Arnaud
5724b55f7b Merge pull request #1507 from pijyoi/fixdoc
ZMQ_TCP_KEEPALIVE_IDLE doc wrongly mentions TCP_KEEPCNT
2015-08-04 15:52:53 +02:00
KIU Shueng Chuan
2d9c7f3a1f ZMQ_TCP_KEEPALIVE_IDLE doc wrongly mentions TCP_KEEPCNT
was fixed in zmq_setsockopt.txt but not in zmq_getsockopt.txt
2015-08-04 21:43:44 +08:00
Richard Newton
d65dab2039 Merge pull request #1504 from bluca/travis-file-limit
Increase file limit in travis config
2015-08-02 19:22:53 +01:00
Luca Boccassi
85da2ea42f Increase file limit in travis config
Test cases occasionally fail, especially on OSX, due to socket limit.
Part of fix for #1502
2015-08-02 19:20:34 +01:00
Constantin Rack
23655c5c56 Merge pull request #1503 from bluca/travis-ci-osx
Travis ci osx
2015-08-02 20:08:34 +02:00
Luca Boccassi
270a1ac577 Add OSX build to travis config. Fixes #1502 2015-08-02 18:59:34 +01:00
Luca Boccassi
20ba661019 Do not use ldconfig in CI if running on OSX
ldconfig is not available on OSX, so Travis CI build fails
2015-08-02 18:38:35 +01:00
Luca Boccassi
40e2befbbe Update NDK version to r10e, OSX support 2015-08-02 18:38:35 +01:00
Luca Boccassi
102d1b14d0 Check for [g]readelf availability in qt-android helper
readelf is not available on OSX, greadelf is available on homebrew
2015-08-02 18:38:35 +01:00
Richard Newton
57ef59352b Merge pull request #1501 from jemc/fix/issue-1500
Remove type-pun in zmq.cpp to resolve issue #1500.
2015-08-02 16:35:10 +01:00
Joe Eli McIlvain
438b5207f6 Remove type-pun in zmq.cpp to resolve issue #1500. 2015-08-02 08:27:07 -07:00
Constantin Rack
67640557de Merge pull request #1499 from jemc/docfix/setsockopt
Documentation fixes for socket options.
2015-08-01 18:41:44 +02:00
Joe Eli McIlvain
6d0cea54aa Fix alphabetical order of non-deprecated setsockopt docs. 2015-07-31 22:37:36 -07:00
Joe Eli McIlvain
94c579a6c0 Fix title of docs for ZMQ_XPUB_WELCOME_MSG socket option. 2015-07-31 22:36:57 -07:00
Constantin Rack
7b5bf4aefe Merge pull request #1498 from pijyoi/master
ZMQ_TCP_KEEPALIVE_IDLE doc wrongly says it overrides TCP_KEEPCNT
2015-08-01 00:35:41 +02:00
KIU Shueng Chuan
d9f32611ad ZMQ_TCP_KEEPALIVE_IDLE doc wrongly says it overrides TCP_KEEPCNT 2015-08-01 06:29:06 +08:00
Joe Eli McIlvain
2d8b1a78b3 Merge pull request #1497 from bluca/fix-autogen-libtool-detection
Check for libtoolize instead of libtool on Linux
2015-07-30 16:55:35 -07:00
Luca Boccassi
89fa904b2d Check for libtoolize instead of libtool on Linux
autogen.sh has a check for the libtool binary as a mean to
check if libtool is available. But distributions like Debian and
Ubuntu are splitting the libtool package, and the libtool binary is now
in a separate package. What autoconf actually need is not the libtool
binary, but libtoolize and other macro files. So check for libtoolize
instead. On the other hand, OSX only ships libtool, not libtoolize,
and uses a pre-generated libtool script to build. So check for
libtoolize first and then for libtool, and fail if neither can be
found.
2015-07-31 00:47:51 +01:00