3725 Commits

Author SHA1 Message Date
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