0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 10:18:01 +08:00

3737 Commits

Author SHA1 Message Date
Sergei Nikulov
6a88bdb606 ported #1394 from libzmq 2015-11-10 10:34:34 +03:00
Pieter Hintjens
30b070a376 Merge pull request #72 from hintjens/master
Updated NEWS
2015-11-04 10:03:33 +01:00
Pieter Hintjens
550013b9e4 Updated NEWS 2015-11-04 10:02:16 +01:00
Joe Eli McIlvain
a75b7543e8 Merge pull request #69 from maytechnet/master
Problem: return code of sodium_init() is not checked.
2015-11-03 08:33:43 -08:00
Constantin Rack
89d4e995ef Problem: return code of sodium_init() is not checked.
There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
checking the return code of sodium_init() call. sodium_init() returns -1 on error,
0 on success and 1 if it has been called before and is already initalized:
https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c
2015-11-03 18:04:42 +02:00
Constantin Rack
2aa08155f4 Merge pull request #68 from zeromq/revert-42-vs2008_stdint_fix
Revert "stdint.h is available in VS2008 (1500)"
2015-11-03 10:31:54 +01:00
Min RK
28432b562d Revert "stdint.h is available in VS2008 (1500)" 2015-11-03 09:56:19 +01:00
Constantin Rack
7bec6c1bdb Merge pull request #67 from hintjens/master
Backported fix for #1399
2015-11-01 10:47:55 +01:00
Pieter Hintjens
c41d8aa12b Updated version number for next release 2015-11-01 09:10:28 +01:00
Pieter Hintjens
a73740b304 Backported fix for #1399
Problem: asserts if EINVAL recieved on read/write

This causes assertion failures after network reconnects.

Solution: allow EINVAL as a possible condition after read/write.

Fixes #829
Fixes #1399

Patch provided by Michele Dionisio @mdionisio, thanks :)
2015-11-01 09:10:09 +01:00
Pieter Hintjens
e3e699190f Merge pull request #65 from jstefanski/fix_cmake_3_build
Fix FindAsciiDoc module for CMake 3
2015-10-06 14:47:10 +02:00
Jakub Stefanski
3db502ba47 Fix FindAsciiDoc module for CMake 3
Fixed '(' and ')' braces usage volation according to CMake
policy CMP0053 in FindAsciiDoc module.
2015-10-06 14:23:33 +02:00
Constantin Rack
549ee2401c Merge pull request #64 from GreatFruitOmsk/fix-msvc2015
Fix configure failure on 32-bit MSVC.
2015-09-11 10:49:51 +02:00
Artem Martynovich
279bcb2843 Fix configure failure on 32-bit MSVC.
Windows libraries being checked (ws2_32, rpcrt4, iphlpapi) contain functions following stdcall convention. While on 64-bit platform it makes no difference, on 32-bit it does. For example, function WSAGetLastError is mangled by MSVC like "_WSAGetLastError@0". CMake checks if a function FUNC is present in a library by compiling a simple C source containing function definition "char FUNC()" and then calling it. Since stdcall functions are mangled in such a way that requires correct number of arguments (written after "@"), checking for a function with non-zero number of arguments will fail.
That is why we check for functions which have zero arguments and we also force stdcall convention.
2015-09-11 13:39:19 +05:00
Pieter Hintjens
759790cadc Merge pull request #63 from GreatFruitOmsk/fix-msvc2015
Fix CMake configuration issue with MSVC 2015.
2015-09-08 08:21:10 -04:00
Artem Martynovich
415916d5f9 Fix CMake configuration issue with MSVC 2015.
Check for actual functions in ws2_32, ws2, rpcrt4, iphlpapi instead of printf.
2015-09-08 13:29:17 +06:00
Pieter Hintjens
cf38d9b7df Prepared for next release 4.1.4 2015-08-17 13:11:10 +02:00
Pieter Hintjens
765b1f24e3 Merge pull request #62 from hintjens/master
Fixed NEWS for release 4.1.3
v4.1.3
2015-08-17 12:49:15 +02:00
Pieter Hintjens
a1fcf2f740 Fixed NEWS for release 4.1.3 2015-08-17 12:48:04 +02:00
Joe Eli McIlvain
53db7468b6 Merge pull request #61 from bluca/ci-container-build
Enable container-based build
2015-08-16 18:28:35 -07:00
Luca Boccassi
e39517c9f5 Enable container-based build
Remove use of "sudo", build and install in local directory in order
to enable container-based CI builds
2015-08-17 01:36:10 +01:00
Constantin Rack
7f45c052c4 Merge pull request #60 from GreatFruitOmsk/master
Fix documentation of the ZMQ_REQ_CORRELATE option.
2015-08-11 04:39:39 +02:00
Ilya Kulakov
b1bdec4404 Fix documentation of the ZMQ_REQ_CORRELATE option.
Full message is actually (request id, identity, 0,
user frames...).
2015-08-10 22:32:16 -04:00
Richard Newton
1cccf94c2e Merge pull request #59 from bluca/fix-ci-timeout
Problem: CI may fail due to timeout. Fixes #58
2015-08-02 19:32:43 +01:00
Luca Boccassi
92f2b073be Problem: CI may fail due to timeout. Fixes #58
Solution: cherry-pick Pieter Hintjens commit a7a512ab from libzmq
repository to increase test timeouts to 250 msec.
2015-08-02 19:23:22 +01:00
Richard Newton
6282d76268 Merge pull request #57 from bluca/travis-ci-osx
Travis ci osx
2015-08-02 19:22:07 +01:00
Luca Boccassi
866b02895f Increase file limit in travis config
Test cases occasionally fail, especially on OSX, due to socket limit.
2015-08-02 19:16:38 +01:00
Luca Boccassi
073807371c Add OSX build to travis config. Fixes #56 2015-08-02 19:04:21 +01:00
Luca Boccassi
7849d02214 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:53:33 +01:00
Constantin Rack
0b4dfd8193 Merge pull request #55 from bluca/fix-autogen-libtool-detection
Solution: check for libtoolize in autogen. Fixes #54
2015-08-01 13:59:55 +02:00
Luca Boccassi
b7226da0d0 Solution: check for libtoolize in autogen. Fixes #54
Autogen.sh looks for the libtool command as a mean to check if
libtool is available. But distributions like Debian and Ubuntu have
split the libtool package, and the libtool script is now in a
separate package. The solution is to look for the libtoolize command
too before failing, which is what the Autotools chain actually needs
on Linux. Keep checking for libtool to be compatible with OSX, where
the opposite is true.
2015-08-01 12:42:16 +01:00
Constantin Rack
74fe8b6125 Merge pull request #53 from rikvdh/master
Fix issue #52, reset all bits in getsockopt
2015-08-01 10:55:15 +02:00
Rik van der Heijden
a9ca06847b Fix issue #52, reset all bits in getsockopt 2015-08-01 10:28:57 +02:00
Joe Eli McIlvain
7e7ce778ef Merge pull request #50 from leonarf/patch-1
THREAD_SCHED_POLICY & THREAD_PRIORITY documentation
2015-07-15 09:35:45 -04:00
leonarf
95b3f204a8 THREAD_SCHED_POLICY & THREAD_PRIORITY documentation
Documentaion of ZMQ_THREAD_SCHED_POLICY and ZMQ_THREAD_PRIORITY context's option.
2015-07-15 15:19:17 +02:00
Richard Newton
1d0f7b6979 Merge pull request #49 from blalor/patch-1
Fix path to libzmq .so files in RPM spec file
2015-07-03 16:03:01 +01:00
Brian Lalor
a3f4b4ef78 Remove missing man page from spec file 2015-07-03 07:57:31 -04:00
Brian Lalor
c78a5fd443 Fix path to libzmq .so files in RPM spec file
Fixes a packaging error when building the RPM:

```
$ rpmbuild -tb --with libsodium zeromq-4.1.2.tar.gz
[…]
RPM build errors:
    File not found: …/zeromq-4.1.2-1.el6.x86_64/usr/lib64/libzmq.so.4
    File not found: …/zeromq-4.1.2-1.el6.x86_64/usr/lib64/libzmq.so.4.0.0

$ ls …/zeromq-4.1.2-1.el6.x86_64/usr/lib64/libzmq*
libzmq.a  libzmq.la  libzmq.so  libzmq.so.5  libzmq.so.5.0.0
```
2015-07-03 07:47:48 -04:00
Pieter Hintjens
9a63ac7c54 Merge pull request #47 from calid/ignore-test_proxy_single_socket
add test_proxy_single_socket to gitignore
2015-06-29 08:08:08 +02:00
Pieter Hintjens
533437a5c0 Merge pull request #48 from calid/issue-949-tests
add tests for zeromq/libzmq#949
2015-06-29 08:04:41 +02:00
Dylan Cali
6b8aae0b54 be pedantic and call zmq_close in tests 2015-06-28 22:32:55 -05:00
Dylan Cali
b0023f0ccf fix errant comments 2015-06-28 21:28:49 -05:00
Dylan Cali
0684a760c9 add test_proxy_single_socket to gitignore 2015-06-28 21:04:55 -05:00
Dylan Cali
c8c36f5907 add tests for zeromq/libzmq#949 2015-06-28 20:53:04 -05:00
Constantin Rack
b5d8b360d7 Merge pull request #46 from dnaeon/typo-fix
Typo fix
2015-06-23 10:37:58 +02:00
Marin Atanasov Nikolov
5bd3a0d433 Typo fix 2015-06-23 14:34:33 +03:00
Pieter Hintjens
97a0b5dc08 Merge pull request #45 from c-rack/update-news
Problem: NEWS was not updated for backported fix on ipv6 addresses
2015-06-23 09:42:10 +02:00
Constantin Rack
b178072326 Solution: add backported fix to NEWS 2015-06-23 09:24:22 +02:00
Richard Newton
3869d7d490 Merge pull request #44 from c-rack/fix-ipv6-resolve
Solution: allow brackets in tcp address. Fixes #43
2015-06-23 08:11:03 +01:00
Constantin Rack
81464652d2 Solution: allow brackets in tcp address. Fixes #43 2015-06-23 08:29:36 +02:00
Constantin Rack
66d32eb04c Merge pull request #42 from mindw/vs2008_stdint_fix
stdint.h is available in VS2008 (1500)
2015-06-19 14:13:15 +02:00
Gabi Davar
8a41475b74 stdint is available in VS2008 (1600) 2015-06-19 14:49:04 +03:00
Constantin Rack
982f9ebfdb Merge pull request #41 from hintjens/master
Update version for next release, 4.1.3
2015-06-15 11:47:09 +02:00
Pieter Hintjens
e740796065 Update version for next release, 4.1.3 2015-06-15 11:45:16 +02:00
Pieter Hintjens
575da3ec7a Merge pull request #40 from hintjens/master
Updated NEWS for 4.1.2
v4.1.2
2015-06-15 11:42:56 +02:00
Pieter Hintjens
58d8206c05 Updated NEWS for 4.1.2 2015-06-15 11:39:27 +02:00
Pieter Hintjens
d62bf33503 Merge pull request #39 from hintjens/master
Problem: 4.1 broke the ABI yet did not bump ABI number
2015-06-11 23:54:51 +02:00
Pieter Hintjens
7e89feb7ce Problem: 4.1 broke the ABI yet did not bump ABI number
Solution: bump to ABI version 5
2015-06-11 23:52:30 +02:00
Pieter Hintjens
f2c32954eb Merge pull request #38 from minrk/4.1.2
bump version to 4.1.2
2015-06-08 09:03:25 +02:00
Min RK
87c888a9c0 bump version to 4.1.2
4.1.1 has been released
2015-06-07 21:33:22 -07:00
Constantin Rack
b2f788135a Merge pull request #37 from minrk/proxy-single-socket
backport fix for #1428
2015-06-07 20:22:13 +02:00
Min RK
9be539a1e1 test proxy with single REP socket 2015-06-07 11:09:08 -07:00
Min RK
fd7ba4d509 don't check POLLOUT for single-socket proxies 2015-06-07 11:09:08 -07:00
Pieter Hintjens
a2e6e12b6c Merge pull request #36 from junovitch/fix-man-install-without-doc-build
Enable install of man pages when BUILD_DOC is not set by shifting INS…
2015-06-07 01:11:09 +02:00
Jason Unovitch
c75cc9ec5b Enable install of man pages when BUILD_DOC is not set by shifting INSTALL_MAN outside of BUILD_DOC's if/endif 2015-06-06 18:49:21 -04:00
Constantin Rack
23f68d2b39 Merge pull request #35 from hintjens/master
Problem: event interface isn't compatible with CZMQ 3.0
2015-06-04 13:51:47 +02:00
Pieter Hintjens
4f0fd36410 Problem: event interface isn't compatible with CZMQ 3.0
Solution: backport the latest STDINT definitions from libzmq.

Fixes #34
2015-06-04 13:19:52 +02:00
Pieter Hintjens
25cd81b7f3 Merge pull request #33 from hintjens/master
Fixes to README
2015-06-02 23:46:49 +02:00
Pieter Hintjens
7515323295 Fixes to README 2015-06-02 23:46:05 +02:00
Pieter Hintjens
d5a66f7b7d Merge pull request #32 from hintjens/master
Problem: source file headers are somewhat confusing about LGPLv3
2015-06-02 23:41:02 +02:00
Pieter Hintjens
b0a69fc623 Problem: source file headers are somewhat confusing about LGPLv3
Of course people still "can" distributed the sources under the
LGPLv3. However we provide COPYING.LESSER with additional grants.

Solution: specify these grants in the header of each source file.
2015-06-02 22:47:01 +02:00
Pieter Hintjens
203cd808e2 Updated NEWS for release 4.1.1 v4.1.1 2015-06-02 12:34:28 +02:00
Pieter Hintjens
e31c108885 Merge pull request #31 from c-rack/fix-travis-ci-badge
Solution: Use the correct URL. Fixes #30
2015-05-27 15:32:00 +02:00
Constantin Rack
610a956bed Solution: Use the correct URL. Fixes #30 2015-05-27 14:44:31 +02:00
Constantin Rack
7b786b2537 Merge pull request #29 from rikvdh/master
Fix another degradation, CPU maxes out when POLLOUT is set
2015-05-27 14:34:55 +02:00
Rik van der Heijden
b5a00b76e8 Fix another degradation, CPU maxes out when POLLOUT is set because poll exits on POLLOUT and doesn't wait for POLLIN. 2015-05-27 14:21:47 +02:00
Pieter Hintjens
1d18b39c4b Merge pull request #28 from rikvdh/master
Fix degradation from #1382, POLLOUT was tested but not requested
2015-05-24 22:59:10 +02:00
Rik van der Heijden
3a0f218cae Fix degradation from #1382, POLLOUT was tested but not requested 2015-05-24 22:38:22 +02:00
Pieter Hintjens
934b599938 Merge pull request #26 from hintjens/master
Backported fix for #1382
2015-05-01 11:36:58 +02:00
Pieter Hintjens
d41b1ecdf7 Problem: Makefile.am doesn't built test_proxy_terminate correctly
Solution: fix it.
2015-05-01 11:35:35 +02:00
Pieter Hintjens
c188667963 Merge pull request #25 from hintjens/master
Merged fix for #1382
2015-05-01 11:33:30 +02:00
Rik van der Heijden
1c7b09afaf Merged fix for #1382
Also fixed Makefile.am with missing specs for test case.
2015-05-01 11:32:42 +02:00
Rik van der Heijden
f5e1c607a5 Merged fix for #1382 2015-05-01 11:26:26 +02:00
Pieter Hintjens
752338ec87 Merge pull request #24 from hintjens/master
Fix for #1384
2015-05-01 08:45:46 +02:00
Pieter Hintjens
3ef80cec74 Updated NEWS for #1389 2015-05-01 08:43:34 +02:00
Martin Hurton
6f75687c9e pub: Don't delay pipe termination 2015-05-01 08:42:54 +02:00
Martin Hurton
8e26e4b35c push: Don't delay pipe termination 2015-05-01 08:42:38 +02:00
Pieter Hintjens
837cc2cd75 Merge pull request #23 from hintjens/master
Backported 594e3d
2015-04-22 00:29:41 +03:00
Pieter Hintjens
7b4c323bfd Updated NEWS for 594e3d 2015-04-21 23:28:38 +02:00
Pieter Hintjens
fee19e26ac Problem: shutdown asserts if WSASTARUP wasn't done previously
This is a silly assertion that causes problems if libzmq.dll is
called in some esoteric ways.

Solution: if the shutdown code detects WSANOTINITIALISED, then
exit silently.

Fixes #1377
Fixes #1144
2015-04-21 23:23:42 +02:00
Pieter Hintjens
f22094b61a Merge pull request #22 from calid/docfix-zmq-msg-init
doc: zmq_msg_init does not set errno
2015-03-15 11:25:44 +01:00
Dylan Cali
ff0380d1f6 doc: zmq_msg_init does not set errno
In fact it always returns zero.

Backport of zeromq/libzmq#1368
2015-03-15 04:02:44 -05:00
Pieter Hintjens
6072d3dbdc Merge pull request #21 from hintjens/master
Fixed issue #1362
2015-02-20 09:15:02 +01:00
Pieter Hintjens
609ec133b4 Updated news for #1362 2015-02-20 09:14:02 +01:00
Martin Hurton
160a7efae4 Adjust number of sent messages on hiccups
Not adjusting the sent message count may lead to situation when SUB
socket does not forward its subscriptions.
2015-02-20 09:13:47 +01:00
Constantin Rack
aa2237b8d6 Merge pull request #20 from rodgert/master
resolve #1347 addresses issue of no metadata on identity frame
2015-02-19 20:33:49 +01:00
Thomas Rodgers
73fa40b9ac resolve #1347 addresses issue of no metadata on identity frame 2015-02-19 13:31:26 -06:00
Thomas Rodgers
2a3379af4d Revert "resolve #1347 addresses issue of no metadata on identity frame"
This reverts commit f75ed8565e984f423e748717108486b458d5a724.
2015-02-19 13:27:18 -06:00
Thomas Rodgers
f75ed8565e resolve #1347 addresses issue of no metadata on identity frame 2015-02-19 13:26:26 -06:00
Pieter Hintjens
5b6b850d9a Merge pull request #19 from rodgert/master
Revert previous accidental push directly to zeromq/zeromq4-1
2015-02-18 21:18:43 +01:00