Joe Eli McIlvain
33419425eb
Problem: Private/internal macros defined in public header.
...
Solution: Move the macros to a private header.
2015-08-21 16:12:22 -07:00
Pieter Hintjens
735c02ed5e
Merge pull request #1546 from reza-ebrahimi/master
...
rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
2015-08-21 23:57:18 +02:00
reza.ebrahimi
63260d8701
rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
2015-08-22 00:31:25 +04:30
Constantin Rack
b07b1e270e
Merge pull request #1545 from ricnewton/master
...
Fix zmq crash when calling shutdown with a pending inproc socket connect
2015-08-21 11:25:45 +02:00
Richard Newton
096007c574
Fix zmq crash when calling shutdown with a pending inproc socket connect
2015-08-21 10:06:54 +01:00
Constantin Rack
4e5843b8ff
Merge pull request #1543 from csiro-workspace/master
...
Set signaler_port to 0 which allows the OS to find a free port
2015-08-21 08:12:09 +02:00
Matt Bolger
7e09306cb3
-Set signaler_port to 0 which allows the OS to find a free port, rather than crashing if 5905 is in use ( https://github.com/zeromq/libzmq/issues/1542 )
...
-Added config.hpp to the source list so it shows up in generated projects
-Remove CMAKE_BUILD_TYPE setting for generators that don't use it
2015-08-21 13:45:59 +10:00
Constantin Rack
ec98916e82
Merge pull request #1541 from jemc/master
...
Problem: Source files contain mixed tabs and spaces.
2015-08-20 16:54:03 +02:00
Joe Eli McIlvain
61217a2686
Problem: Source files contain mixed tabs and spaces.
...
Solution: Convert to spaces and remove trailing whitespace in these files.
2015-08-20 07:46:34 -07:00
Richard Newton
6aa5c20b3d
Merge pull request #1540 from djelenc/fix_failing_tests
...
Fixes failing tests regarding XPUB sockets.
2015-08-20 14:44:45 +01:00
David Jelenc
1240d7ac83
Fixes failing tests regarding XPUB sockets.
...
Fixes tests that were introduced in a previous pull request. See
https://github.com/zeromq/libzmq/pull/1539#issuecomment-132968987
2015-08-20 15:32:23 +02:00
Constantin Rack
391bc12d17
Merge pull request #1539 from djelenc/issue1116
...
Addresses zeromq/libzmq#1116 .
2015-08-20 12:34:19 +02:00
David Jelenc
b9634e11a3
Addresses zeromq/libzmq#1116 .
...
This patch adds a new member of type deque to the
xpub class that contains pointers to metadata_t.
This deque is then used (alongside pending_data
and pending_flags) to preserve metadata when
copying messages.
2015-08-20 12:09:56 +02:00
Kapp Arnaud
370b8c9bb1
Problem: Identity frame from router has no metadata
...
The routing id (identity) frame return when reading from
a router doesn't have the same metadata as the "real"
message that follows.
For example, The ZAP "User-Id" property is missing.
This patch attach the "data message"'s metadata
to the "identity message" when it is read from the router.
2015-08-20 01:15:18 +02:00
Constantin Rack
3f326b10d6
Merge pull request #1536 from bluca/ci-osx-missing-dependency
...
CI run on OSX needs binutils
2015-08-17 18:17:20 +02:00
Constantin Rack
709a1e9a2d
Merge pull request #1535 from somdoron/master
...
problem: trying to support polling on thread safe sockets with zmq_poll failed
2015-08-17 18:11:52 +02:00
Luca Boccassi
0c4032b5af
CI run on OSX needs binutils
...
OSX does not ship with binutils, need to install it before the script
run via brew in order to be able to use greadelf, needed by the
qt-android CI script.
2015-08-17 17:06:56 +01:00
somdoron
4da5ff6a7d
revert to original zmq_polland creating zmq_pollfd_poll for polling on pollfd
2015-08-17 18:57:47 +03:00
Constantin Rack
a96f16e3fa
Merge pull request #1534 from somdoron/master
...
problem: new poller field in zmq_pollitem_t is changing the api
2015-08-17 13:40:26 +02:00
somdoron
d83b045347
rename poller to pollfd
2015-08-17 14:20:49 +03:00
Pieter Hintjens
7d42aac0c5
Merge pull request #1533 from c-rack/fix-tests
...
Problem: tests fail after PR #1531
2015-08-17 13:17:53 +02:00
Constantin Rack
34fe5eaf26
Solution: explicitly set u.base.metadata to null
2015-08-17 12:41:27 +02:00
somdoron
5bae6911af
remove poller field, using fd instead
2015-08-17 11:56:23 +03:00
Constantin Rack
87e7ed054b
Merge pull request #1531 from reza-ebrahimi/master
...
apply a change to LIBZMQ_DELETE macro (related to issue #1524 )
2015-08-16 22:54:01 +02:00
reza.ebrahimi
7058c54672
apply a change to LIBZMQ_DELETE macro (related to issue #1524 )
2015-08-17 01:00:55 +04:30
Constantin Rack
6d9eb184b5
Merge pull request #1530 from reza-ebrahimi/master
...
define a macro for heap object deletion in a unified manner (related …
2015-08-16 22:21:19 +02:00
reza.ebrahimi
1621c25ef0
define a macro for heap object deletion in a unified manner (related to issue #1524 )
2015-08-17 00:35:11 +04:30
Constantin Rack
9bf88bcc03
Merge pull request #1529 from bluca/container
...
Container-based CI build
2015-08-16 21:32:39 +02:00
Luca Boccassi
1ab4667412
Set -x in ci_build.sh to show commands in log
2015-08-16 20:20:59 +01:00
Luca Boccassi
f6b0eaddb5
Set sudo: false to force container build
2015-08-16 20:20:59 +01:00
Luca Boccassi
1afc30a6c4
CI build/install in local directory
2015-08-16 20:20:59 +01:00
Constantin Rack
9ebd54a9e5
Merge pull request #1528 from bluca/fix-travis-check
...
CI build does not fail when tests fail. Fix #1527
2015-08-16 17:45:57 +02:00
Luca Boccassi
f4e9e6f062
CI build does not fail when tests fail. Fix #1527
2015-08-16 16:41:17 +01:00
taotetek
eb1d72f81d
Merge pull request #1526 from somdoron/master
...
problem: new field is breaking existing code
2015-08-16 11:09:28 -04:00
somdoron
9d829f72f4
moving new poller field to the end of the struct
2015-08-16 18:00:32 +03:00
Constantin Rack
e74e36def1
Merge pull request #1525 from somdoron/master
...
problem: user cannot poll on thread safe sockets
2015-08-16 13:10:16 +02:00
somdoron
6eddbd98bc
polling on thread safe sockets
2015-08-16 13:57:28 +03:00
somdoron
1653d3c093
add new tests to gitignore
2015-08-16 13:57:28 +03:00
somdoron
1aaa893e02
add tests for polling on thread safe sockets
2015-08-16 13:57:28 +03:00
somdoron
a63818904d
add methods to handle poller
2015-08-16 13:57:28 +03:00
somdoron
34968771ca
add an option to check if the socket is thread safe
2015-08-16 11:50:50 +03:00
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
