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

3687 Commits

Author SHA1 Message Date
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
Thomas Rodgers
d172875f52 Backport resolve #1357 Support limited metadata for STREAM sockets 2015-02-18 13:09:11 -06:00
Thomas Rodgers
9fe4fb3929 Remove autogen.sh warning due to id2fd test cruft 2015-02-18 12:41:33 -06:00
Thomas Rodgers
48ed789c18 Revert "STREAM socket support for limited metadata"
This reverts commit 5afd4e16edb51a3996c8d4b9f698dea8d2917c43.
2015-02-18 12:36:21 -06:00
Thomas Rodgers
c6d5c965fa Revert "Remove debugging cruft"
This reverts commit bbecdf397e0661ff469eb4898008c09d00efc397.
2015-02-18 12:36:19 -06:00
Thomas Rodgers
a69a043e14 Revert "Add connector.close() back"
This reverts commit 5e60f18d3a68947f469346162deae7e65732ba50.
2015-02-18 12:36:13 -06:00
Thomas Rodgers
5e60f18d3a Add connector.close() back
Needed if session->push() ever fails
2015-02-18 11:17:41 -06:00
Thomas Rodgers
bbecdf397e Remove debugging cruft 2015-02-18 11:14:23 -06:00
Thomas Rodgers
5afd4e16ed STREAM socket support for limited metadata
WIP - STREAM socket support for limited metadata

STREAM socket support for limited metadata
2015-02-18 11:12:32 -06:00
Pieter Hintjens
ea3b9c28ae Merge pull request #18 from hintjens/master
Updated NEWS
2015-02-14 17:48:13 +01:00
Pieter Hintjens
fa277000d0 Updated NEWS 2015-02-14 17:47:55 +01:00
Pieter Hintjens
29b7266041 Merge pull request #17 from rodgert/master
resolve #1347 Backport zmq_msg_gets "Peer-Address"
2015-02-14 17:47:01 +01:00
Thomas Rodgers
5229eeef5b resolve #1347 Backport zmq_msg_gets "Peer-Address" 2015-02-14 10:44:52 -06:00
Constantin Rack
712e74eebd Merge pull request #16 from topher200/master
close (clean up) unsendable messages
2015-01-22 23:02:24 +01:00
Topher Brown
89dd9fddaf close (clean up) unsendable messages 2015-01-22 16:56:30 -05:00
Pieter Hintjens
583a5f9601 Merge pull request #14 from metadings/master
Upgrading zmq_msg_t to 64 bytes
2015-01-14 13:31:24 +01:00
Pieter Hintjens
20e3a9f535 Merge pull request #12 from rodgert/master
resolve #1296 Remove of ZMQ_IDENTITY_FD socket option
2015-01-14 13:30:20 +01:00
metadings
d206fe2d45 Upgrading zmq_msg_t to 64 bytes 2015-01-14 13:26:48 +01:00
Constantin Rack
67afb90ba8 Merge pull request #13 from hintjens/master
Problem: patch version was not updated yet for 4.1.1
2015-01-11 21:55:38 +01:00
Pieter Hintjens
79e3de21c3 Problem: patch version was not updated yet for 4.1.1
Solution: ZMQ_VERSION_PATCH is now 1
2015-01-11 21:54:05 +01:00
Thomas Rodgers
8f236dc55e resolve #1296 Remove of ZMQ_IDENTITY_FD socket option
Revert "linking fd to pipe identity via socket option"

This reverts commit fe3e8c5c70dc3fbcb0244c5f4c52dcd71b80f858.

Conflicts:
	include/zmq.h
	src/pipe.hpp
	src/session_base.cpp
2015-01-09 18:14:22 -06:00
Pieter Hintjens
4a8bf129b3 Merge pull request #11 from hintjens/master
Problem: zmq_epgm man page is confusing and redundant
2014-12-07 17:08:24 +01:00
Pieter Hintjens
c477182735 Problem: zmq_epgm man page is confusing and redundant
Solution: delete it. The epgm:// transport is documented in zmq_pgm.
2014-12-07 17:07:22 +01:00
Pieter Hintjens
b272cca3e8 Merge pull request #10 from hintjens/master
Backported fix for #1273 (protocol downgrade attack)
2014-12-05 09:10:26 +01:00
Pieter Hintjens
61a3242085 Updated NEWS for #1273 2014-12-05 09:09:05 +01:00
Phillip Mienk
934973acf0 Alter --with-libsodium default. 2014-12-05 08:50:59 +01:00
Pieter Hintjens
e28b752aad Fixed .gitignore for test files 2014-12-04 14:01:56 +01:00
Pieter Hintjens
aa91fec015 Updated news for issue #1273 2014-12-04 13:43:41 +01:00
Min RK
fffaf6fd42 craft vanilla socket security test messages
use explicit ZMTP/1.0 anonymous greeting
rather than HTTP request that just happened to work
2014-12-04 13:42:27 +01:00
Min RK
4cff7bf372 allow vanilla socket security tests to run on Windows
- add ws2tcpip.h
- alias close->closesocket
- increment port in sec_null test
2014-12-04 13:42:19 +01:00
Min RK
14c94c0df9 add session->zap_enabled()
checks mechanism != NULL, or NULL + non-empty zap_domain
2014-12-04 13:42:15 +01:00
Min RK
56e09c80f8 reject old ZMTP connections if auth enabled
auth mechanisms were only enabled when ZMTP handshake
is latest version, meaning that connections from old sockets
would skip authentication altogether
2014-12-04 13:42:07 +01:00
Min RK
3c1a710d06 Resolved conflict when picking c35c0ca 2014-12-04 13:42:00 +01:00
Pieter Hintjens
66c8b70c7d Merge pull request #9 from hintjens/master
Updated for issue #1213
2014-11-08 10:32:53 +01:00
Pieter Hintjens
b1cba6b8b6 Updated for issue #1213 2014-11-08 10:32:34 +01:00
Pieter Hintjens
06d5d6010e Merge pull request #8 from hintjens/master
Fix builds/msvc/Makefile.am to include all properties files in the build
2014-11-08 10:29:45 +01:00
Dan Mick
8a2052cc52 Fix builds/msvc/Makefile.am to include all properties files in the build
I attempted to fix up the properties files manifests in the Makefile,
but neglected the end-of-line escape characters.  It was good enough
to pass whatever make dist on Linux did, but I had no Windows build
env to test in.  The broken change was in commit de4a442.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2014-11-08 10:29:08 +01:00
Pieter Hintjens
a90183d0de Merge pull request #7 from hintjens/master
Problem: zmq_ctx_term has insane behavior by default
2014-11-06 10:58:20 +01:00
Pieter Hintjens
88c9a4e5ec Problem: zmq_ctx_term has insane behavior by default
Solution: document this with a clear warning. It would be
nicer perhaps to change the default LINGER to e.g. a few
seconds. However this could break existing applications.
2014-11-06 10:57:12 +01:00
Pieter Hintjens
ef71d6f930 Merge pull request #6 from lysyloren/master
Unbind socket with real endpoint when binding by wild-card * address
2014-10-29 17:00:46 +01:00
lysyloren
ed6bf9f178 Unbind socket with real endpoint when binding by wild-card * address 2014-10-29 10:17:30 +01:00
Pieter Hintjens
acd55c7464 Merge pull request #5 from johntconklin/master
backport configure and rpmbuild fixes.
2014-10-28 13:38:51 +01:00
J.T. Conklin
a87c0d495f Support both --enable-eventfd and --disable-eventfd options. 2014-10-28 05:10:06 -07:00
J.T. Conklin
3b9049f163 Correct libgssapi_krb5 packages. 2014-10-28 04:56:32 -07:00
J.T. Conklin
3592c1ec1a Pass --with/--without-libgssapi_krb5 to configure. 2014-10-28 04:56:14 -07:00
Phillip Mienk
c0579448d8 Add support for --with/--without libgssapi_krb5 2014-10-28 04:55:54 -07:00
Phillip Mienk
0b1b5f283f Add --with-libgssapi_krb5 to match libsodium and pgm. 2014-10-28 04:55:32 -07:00
Pieter Hintjens
95fa16f3ef Merge pull request #4 from hintjens/master
Backported fixes from master
2014-10-23 10:30:00 +02:00
Pieter Hintjens
68f16a06ae Backported pull request #1225 2014-10-23 10:29:37 +02:00
Martin Hurton
03c35d2659 Fix issue #1224 2014-10-23 10:28:19 +02:00
Pieter Hintjens
966256d1b6 Merge pull request #3 from johntconklin/master
Cherry-picked configure and rpmbuild fixes from libzmq/master
2014-10-19 18:33:39 +02:00