0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-01 02:27:49 +08:00

5406 Commits

Author SHA1 Message Date
Constantin Rack
bc7c5a1e96 Merge pull request #2390 from taotetek/master
Problem: want to relicense under mplv2
2017-03-20 09:17:15 +01:00
Constantin Rack
7b2ba9f842 Merge pull request #2389 from johntconklin/relicense
RELICENSE: John T. Conklin grant
2017-03-20 09:16:50 +01:00
Constantin Rack
b121e621c0 Merge pull request #2395 from ckamm/ckamm-relicense
RELICENSE: Christian Kamm grant
2017-03-20 08:44:28 +01:00
Christian Kamm
0434e03932 RELICENSE: Christian Kamm grant 2017-03-20 08:01:37 +01:00
Constantin Rack
6c424465a6 Merge pull request #2394 from danielhtshih/master
RELICENSE: Daniel Shih grant
2017-03-20 07:59:17 +01:00
Constantin Rack
61cf277d81 Merge pull request #2393 from evoskuil/master
RELICENSE: Eric Voskuil grant
2017-03-20 07:58:09 +01:00
Daniel Shih
555f4ccb56 RELICENSE: Daniel Shih grant 2017-03-20 13:32:06 +08:00
evoskuil
eb3f00717f RELICENSE: Eric Voskuil grant 2017-03-19 20:55:24 -07:00
Brian Knox
2ac51173de Problem: want to relicense under mplv2 2017-03-19 20:38:40 -04:00
J.T. Conklin
d26414d152 RELICENSE: John T. Conklin grant 2017-03-19 17:33:59 -07:00
Luca Boccassi
027856d770 Merge pull request #2385 from rgagnon24/master
RELICENSE: Robert Gagnon
2017-03-19 22:39:37 +00:00
Luca Boccassi
2b7cda2eff Merge pull request #2386 from jkryl/master
RELICENSE: Jan Kryl grant
2017-03-19 22:39:16 +00:00
chuggafan
7913e96271 I have added msys building, license stuff (#2387)
(msys building is buggy, please be aware, it fails to compile on my
machine) also I modified the buildall.bat/buildbase.bat to use correct
MSVC versions instead of "visual studio 2017"
2017-03-19 22:38:43 +00:00
Luca Boccassi
8ce9a11af4 Merge pull request #2388 from TTimo/master
relicensing
2017-03-19 22:37:57 +00:00
Luca Boccassi
7df5373c12 Merge pull request #2384 from agronholm/master
Relicense: Alex Grönholm grant
2017-03-19 22:37:39 +00:00
Timothee Besset
cef0289f4d relicensing 2017-03-19 17:32:46 -05:00
Jan Kryl
c0ddcf6f5c RELICENSE: Jan Kryl grant 2017-03-19 23:04:23 +01:00
Rob Gagnon
28e3225801 RELICENSE: Robert Gagnon 2017-03-19 16:59:22 -05:00
Alex Grönholm
63120a88b0 Create agronholm.md 2017-03-19 23:47:04 +02:00
Luca Boccassi
6517d9199c Merge pull request #2383 from thompsa/master
RELICENSE: Andrew Thompson grant
2017-03-19 21:32:42 +00:00
Andrew Thompson
b9ac5cdc6c RELICENSE: Andrew Thompson grant 2017-03-20 10:27:57 +13:00
Luca Boccassi
d4b90657e8 Merge pull request #2382 from AndreLouisCaron/relicense
RELICENSE: Andre Caron grant
2017-03-19 21:24:48 +00:00
Andre Caron
625f52e3a2 RELICENSE: Andre Caron grant 2017-03-19 17:02:05 -04:00
Luca Boccassi
c4d80a50c0 Merge pull request #2380 from cdolan/relicense
RELICENSE: Christopher Dolan grant
2017-03-19 20:38:34 +00:00
Christopher Dolan
eaa77b383b RELICENSE: Christopher Dolan grant 2017-03-19 16:33:08 -04:00
Constantin Rack
5aab04b083 Merge pull request #2379 from yuvallanger/master
RELICENSE: Yuval Langer grant
2017-03-19 21:14:08 +01:00
Yuval Langer
4ea0dc4778 RELICENSE: Yuval Langer grant 2017-03-19 22:07:40 +02:00
Luca Boccassi
b43cd5af78 Merge pull request #2378 from staticfloat/sf/relicensing
Add relicensing agreement for Elliot Saba
2017-03-19 19:53:27 +00:00
Luca Boccassi
4856169620 Merge pull request #2377 from tailhook/relicense
Relicense permission by Paul Colomiets
2017-03-19 19:52:01 +00:00
Elliot Saba
c33b875d11 Add relicensing agreement for Elliot Saba 2017-03-19 12:51:48 -07:00
Paul Colomiets
86c7be3854 Relicense permission by Paul Colomiets 2017-03-19 21:46:49 +02:00
mlodew
9091623243 Fixed lib and dll paths in visual studio build (#2375)
Fixed path to lib and dll files.
2017-03-19 16:50:33 +00:00
Doron Somech
4cc32d3367 Merge pull request #2374 from rlenferink/license_grants
RELICENSE: Added templates for relicensing
2017-03-17 19:43:47 +02:00
Roy Lenferink
a46ca653a9 RELICENSE: Added templates for relicensing 2017-03-17 17:11:25 +01:00
Luca Boccassi
eccf8b7aae Merge pull request #2373 from rlenferink/rlenferink_grant
RELICENSE: License grant by Roy Lenferink
2017-03-17 16:01:19 +00:00
Roy Lenferink
bf2b957c49 RELICENSE: Roy Lenferink grant 2017-03-17 16:35:57 +01:00
Luca Boccassi
db854614e1 Merge pull request #2372 from Q-Leap-Networks/pr-fix_test_sodium
zmq_curve_keypair(): return result from crypto_box_keypair()
2017-03-16 14:48:15 +00:00
Goswin von Brederlow
1dd5fef20c zmq_curve_keypair(): return result from crypto_box_keypair() to make testcase meaningfull 2017-03-16 14:01:08 +00:00
Constantin Rack
da1633ebe7 Merge pull request #2368 from bluca/io_thread_name
Problem: refactor gone wrong, redundant thread name
2017-03-12 14:28:30 +01:00
Luca Boccassi
d7aceef2ed Problem: thread name is redundant
Solution: call it simply "ZMQ background" instead of "ZMQ b/g thread"
2017-03-12 13:11:44 +00:00
Luca Boccassi
092ad50b0c Problem: I can't refactor
Solution: fix ifdef check for pthread_setname
2017-03-12 13:11:11 +00:00
Constantin Rack
33246f7a9e Merge pull request #2367 from bluca/io_thread_name
Problem: ZMQ background threads are unnamed
2017-03-12 10:47:34 +01:00
Luca Boccassi
3ab4796c5a Problem: ZMQ background threads are unnamed
Solution: use pthread API to set the name. For now call every thread
"ZMQ b/g thread". Would be nice to number the I/O threads and name
explicitly the reaper thread, but in reality a bit of internal API
churn would be necessary, so perhaps it's not worth it.
This is useful when debugging a process with many threads.
2017-03-12 00:46:15 +00:00
Constantin Rack
3548d5e950 Merge pull request #2365 from somdoron/deprecate_zmq_poll
problem:zmq_poll is slow and the API is complicated
2017-03-11 10:21:44 +01:00
somdoron
aac8bb19fc problem:zmq_poll is slow and the API is complicated
solution: deprecate zmq_poll in favor of zmq_poller
2017-03-11 11:20:44 +02:00
Constantin Rack
580c5b288a Merge pull request #2364 from somdoron/master
problem: zmq_poll is slow because FD is being created on every call
2017-03-11 10:20:09 +01:00
somdoron
f694a2d985 problem: zmq_poll is slow because FD is being created on every call
making the creation of FD only when thread safe sockets are in used
within the zmq_poller which improve the zmq_poll performance.
2017-03-11 11:07:06 +02:00
Luca Boccassi
651f81e8af Merge pull request #2362 from nexcvon/patch-2
Problem: zmq::signaler_t::send may loop forever
2017-03-06 15:26:24 +00:00
nexcvon
9624f9ade7 Problem: zmq::signaler_t::send may loop forever
Solution: restore the wsa_assert statement previously removed.
2017-03-06 21:55:30 +08:00
Constantin Rack
70a7756d8d Merge pull request #2361 from bluca/obs_new
Problem: Travis using deprecated OBS project
2017-03-03 23:14:46 +01:00
Luca Boccassi
05a967fa1b Problem: Travis using deprecated OBS project
Solution: switch to shiny new one in the network:messaging namespace
2017-03-03 18:04:26 +00:00
Luca Boccassi
34be53d8e4 Merge pull request #2360 from nexcvon/patch-2
Problem: Assertion failed in zmq::signaler_t::send
2017-03-03 13:13:07 +00:00
nexcvon
bcf75777c8 Problem: Assertion failed in zmq::signaler_t::send
Solution: Change to the way it does below on non-Windows platforms, retry when send returns -1.
2017-03-03 19:00:58 +08:00
Doron Somech
07d904a2f8 Merge pull request #2354 from bluca/fix_pipe
Problem: router pipe can block forever
2017-02-25 06:13:18 +02:00
Luca Boccassi
a73d5cd6c6 Problem: router pipe can block forever
Solution: invert check_write and check_hwm calls in router xsend
function so that check_write can mark the pipe as inactive if
necessary.
2017-02-24 23:56:52 +00:00
Doron Somech
1cfc3e1744 Merge pull request #2353 from bluca/fix_test
Problem: unnecessary change to router_mandatory_hwm test
2017-02-24 21:11:06 +02:00
Luca Boccassi
0f473d14cb Problem: unnecessary change to router_mandatory_hwm test
Solution:

Revert "Problem with ZMQ_ROUTER_MANDATORY option when peer lost"

This partially reverts commit 06740b5d8c1fbf13205c9b6c63ba7e7ef4350a04.

The change in the mentioned commit was fixed to be backward
compatible so test changes are no longer necessary.
Partially revert the commit, leaving only the bug fix and taking out
the test change and the superfluous change in socket_base.
2017-02-24 17:57:14 +00:00
Doron Somech
ca311f7bfe Merge pull request #2352 from reza-ebrahimi/master
Commit: Issue #2348
2017-02-24 19:33:13 +02:00
Reza Ebrahimi
06740b5d8c Problem with ZMQ_ROUTER_MANDATORY option when peer lost
indention

Revert "indention"

This reverts commit a6e7e192ac2d089ac9f7dc0d31d4b1fd10de982e.

indention

indention

Fix Failure in tests

Check both pipe full and pipe close
2017-02-24 20:49:26 +03:30
Doron Somech
995a41b5a3 Merge pull request #2350 from tabe/zmq_socket_doc-typo
Problem: typo in the zmq_socket doc
2017-02-23 09:24:46 +02:00
Takeshi Abe
c7ce4a1cea Problem: typo in the zmq_socket doc
Solution: fix it
2017-02-23 10:29:25 +09:00
boringuy
d6f4263ce3 cmake WITH_LIBSODIUM option is broken (#2349)
* cmake WITH_LIBSODIUM option is broken

- Fixed the variable name in platform.hpp.in
- Fixed #if check for randombytes_close() when libsodium is used

* Fixed typo from previous commit

* Reverted compile error fix for randombytes_close()
2017-02-22 22:28:05 +00:00
Luca Boccassi
6818cced8e Merge pull request #2347 from zstang/patch-1
#2341 fix
2017-02-21 09:46:18 +00:00
zstang
3b0dfd528f #2341 fix
the root path name specified in this file cause the #2341 problem, the root path name is not need.
2017-02-21 17:35:36 +08:00
Constantin Rack
64a85ebf2f Merge pull request #2346 from bluca/news
Problem: 4.2.2 is out, version(s) are out of date
2017-02-18 19:25:43 +01:00
Luca Boccassi
ac5c75cea1 Problem: 4.2.2 is out, version(s) are out of date
Solution: bump changelog, ABI revision, library and packaging version
2017-02-18 17:56:55 +00:00
Constantin Rack
8d75d506b6 Merge pull request #2345 from bluca/news
Problem: NEWS not up to date, packaging versions not up to date
v4.2.2
2017-02-18 18:48:41 +01:00
Luca Boccassi
5285b6e152 Problem: packaging versions out of date
Solution: bump to 4.2.2
2017-02-18 17:43:48 +00:00
Luca Boccassi
854ed90472 Problem: NEWS not up to date
Solution: mention main changes and bug fixes since 4.2.1
2017-02-18 17:40:45 +00:00
Luca Boccassi
26998b738e Merge pull request #2332 from bluca/parse_v4_mapped_in_v6
Problem: v4-in-v6 mapped addresses cause parsing failure
2017-02-07 21:22:24 +00:00
Luca Boccassi
0db22c0069 Merge pull request #2337 from SylvainCorlay/include-find-sodium
Include FindSodium.cmake in dist tarball
2017-02-07 13:22:23 +00:00
Sylvain Corlay
33dccd2bf1 Include FindSodium.cmake in dist tarball 2017-02-07 14:12:43 +01:00
Luca Boccassi
18cb7caeb2 Problem: v4-in-v6 mapped addresses cause parsing failure
Solution: in the address validator accept an endpoint that starts
with :, eg: ::ffff:192.168.0.1:12345 as it's a valid mapped
address.
2017-02-03 11:19:31 +01:00
Luca Boccassi
78dafe5c7c Merge pull request #2331 from jimklimov/sol-poller
Problem: polling does not work well OOB in OpenIndiana
2017-02-02 17:27:23 +00:00
Jim Klimov
f8816945c2 Problem: polling does not work well OOB in OpenIndiana
Solution: even though epoll() semantics are supported in modern illumos, it may differ from what Linux developers are used to expect. Skip epoll and use poll or select semantics (both were checked to work well).
2017-02-02 18:18:37 +01:00
Luca Boccassi
e56bc48ebc Merge pull request #2327 from chutz/fix-divide-by-zero
fix divide by zero in zmq::lb_t::sendpipe
2017-01-28 01:29:20 +00:00
Patrick McLean
df7c684dd5 fix divide by zero in zmq::lb_t::sendpipe
This is based on https://github.com/zeromq/zeromq3-x/pull/116/files
2017-01-27 17:08:20 -08:00
Luca Boccassi
5c34f65ad5 Merge pull request #2326 from SylvainCorlay/framework
Make OS Xframwork build optional
2017-01-27 19:53:28 +00:00
Sylvain Corlay
4e472b18e3 Make OS Xframwork build optional 2017-01-27 19:30:18 +01:00
Ahmad M. Zawawi
bf6d8a5d17 Fix clock_t crash on iOS 9.3.2 and 9.3.5 (#2325)
* Fix possible clock_t crash on iOS 9.3.2 and 9.3.5 + macOS < 10.12

* No need to read return value
2017-01-26 13:21:41 +00:00
sigiesec
c6c21cf197 Problem: zmq_z85_decode does not validate its input (#2322)
* Problem: zmq_z85_decode does not validate its input
Solution: added checks for invalid characters and overflows

* Added tests, added further check for range overflow, removed (multiple) calls to strlen

* Problem: gcc fails to build
Solution: added missing include directive

* Added VS2015 test_utils_z85 project

* Fixed indentation and copyright notice

* Resolved garbage from merge

* Revert "Added VS2015 test_utils_z85 project"

This reverts commit c58b3c664c144326e77135aa1184b6f0dee11143.

* Problem: test calls zmq_z85_decode with a NULL dest
Solution: call zmq_z85_decode with a properly sized buffer

* Problem: tests for zmq_z85_* scattered over two files
Solution: merged files

* Removed reference to removed test file from CMakeLists.txt

* Problem: Missing include directive to stdint.h
Solution: Added include directive

* Define __STDC_LIMIT_MACROS before including stdint.h

* Problem: Wrong variable is checked for invalid character marker
Solution: Use correct variable
2017-01-25 14:28:03 +00:00
Luca Boccassi
673bb506cf Merge pull request #2318 from kurdybacha/static_file_fix
CMake static library output does not match ZeroMQ Config.
2017-01-22 18:43:21 +00:00
Pawel Kurdybacha
877419e94f CMake static library output does not match ZeroMQ Config.
Configuration used in ZeroMQConfig.cmake.in does not match to
explicic "libzmq" output of static build.
2017-01-22 18:17:55 +00:00
Luca Boccassi
c031b0c470 Merge pull request #2317 from SylvainCorlay/windows-static-target-name
Problem: cmake artefacts different from make generated artefacts
2017-01-21 14:27:43 +00:00
Sylvain Corlay
e38453866d Problem: cmake artefacts different from make generated artefacts 2017-01-21 15:14:30 +01:00
Constantin Rack
e5677d89d5 Merge pull request #2315 from bluca/typo
Problem: typo in the zmq_has doc
2017-01-19 22:11:37 +01:00
Luca Boccassi
5f8d87bf32 Problem: typo in the zmq_has doc
Solution: fix it
2017-01-19 21:00:15 +00:00
Luca Boccassi
9aae95e496 Merge pull request #2314 from Asmod4n/master
add test and documentation for "draft" capability
2017-01-19 20:37:16 +00:00
Asmod4n
b7cd6e8a85
add test and documentation for "draft" capability 2017-01-19 20:50:18 +01:00
Luca Boccassi
a6a56e299d Merge pull request #2313 from Asmod4n/patch-1
Problem: cannot check if libzmq was build with draft api
2017-01-19 17:59:03 +00:00
Asmod4n
4dbd387fa9 Add "draft" capability to zmq_has
As discussed in #2307
2017-01-19 18:44:56 +01:00
Luca Boccassi
4c1b338015 Merge pull request #2311 from SylvainCorlay/static-target-name
cmake: Set output name to libzmq for the libzmq-static target
2017-01-19 13:28:35 +00:00
Sylvain Corlay
c65a27213a Problem: name of static library generated by cmake differs from the behavior of kernel.
Solution: Change the target output name from libzmq-static to libzmq.
2017-01-19 13:31:39 +01:00
Luca Boccassi
ee9751ec25 Merge pull request #2308 from chuggafan/master
Updated buildbase and buildall to work with visual studio 2017
2017-01-16 20:11:28 +00:00
chuggafan
020ff65efa Updated buildbase and buildall to work with visual studio 2017 2017-01-16 14:54:40 -05:00
Luca Boccassi
f86053b985 Merge pull request #2304 from JohanMabille/cmake_fix
cmake install on linux fixed
2017-01-12 23:42:19 +00:00
Johan Mabille
36d0c70647 cmake install on linux fixed 2017-01-13 00:10:32 +01:00
Constantin Rack
b8d8c498c6 Merge pull request #2302 from laplaceyang/pr_thread_safe_modify_pipe
Problem: Thread-safe solution for modify hwm of pipe
2017-01-11 09:28:33 +01:00
laplaceyang
107f2441d5 Problem: Thread-safe solution for modify hwm of pipe
Solution: where change pipe hwm, send a command (new type pipe_hwm) to peer, so peer pipe can modify hwm thread-safely
2017-01-11 10:49:54 +08:00
Constantin Rack
4fc313d152 Merge pull request #2301 from bluca/set_peer_unsafe
Problems: modifying pipe from different thread is not safe and HWM always boosted by 1
2017-01-10 21:13:25 +01:00