2898 Commits

Author SHA1 Message Date
Pieter Hintjens
4f4723a684 Merge pull request #76 from mditzel/master
Fix issue #75
2014-04-14 14:02:11 +02:00
Maarten Ditzel
2394784995 Merge branch 'master' of https://github.com/mditzel/zeromq4-x 2014-04-14 13:36:57 +02:00
Maarten Ditzel
488cf5e04c Merge branch 'master' of https://github.com/zeromq/zeromq4-x 2014-04-14 13:36:27 +02:00
Maarten Ditzel
b69cf0d70d Merge branch 'master' of https://github.com/zeromq/zeromq4-x 2014-04-14 11:13:49 +02:00
Maarten Ditzel
75fbd4f8d6 Fix issue #75 2014-04-14 11:01:49 +02:00
Maarten Ditzel
66b49261a8 Fixed link error when cross-compiling with mingw. 2014-04-11 10:10:30 +02:00
Pieter Hintjens
f3cc00b4af Merge pull request #74 from mditzel/master
Fix #73: link error when cross-compiling with mingw.
2014-04-11 09:51:51 +02:00
Pieter Hintjens
dd488421c8 Merge pull request #72 from hintjens/master
Resolve issue #939
2014-04-03 20:49:35 +02:00
Martin Hurton
2ae11cdc8d Resolve issue #939
This bug is caused by fq which can terminate pipe before sending all
frames of a message first. So sometimes two messages were mixed and this
confused ZAP handler.

This patch just modifies one pipe parameter so that socket consumes all
messages before dropping the pipe.
2014-04-03 20:37:10 +02:00
Pieter Hintjens
e02fd0ce36 Merge pull request #71 from hintjens/master
Added man page for zmq_proxy_steerable
2014-03-25 15:22:54 +01:00
Pieter Hintjens
612f6ac862 Added man page for zmq_proxy_steerable 2014-03-25 15:22:01 +01:00
Pieter Hintjens
e2d9aaeb88 Merge pull request #70 from hintjens/master
Backported #797
2014-03-25 07:13:38 +01:00
Pieter Hintjens
c83cc01e03 Backported #797 2014-03-25 07:13:00 +01:00
KIU Shueng Chuan
c1b055a6d8 fix: win32 tcp_keepalive gets set even when option is -1 2014-03-25 07:12:06 +01:00
Pieter Hintjens
0da2a0bed6 Merge pull request #68 from hintjens/master
Bumped version for next release
2014-03-21 07:43:14 +02:00
Pieter Hintjens
3e65ddfce3 Bumped version for next release 2014-03-21 07:42:28 +02:00
Pieter Hintjens
25b692b109 Merge pull request #67 from cosmoharrigan/proxy
Backport zmq_proxy_steerable and fix error in proxy function prototype
2014-03-19 09:53:39 +02:00
Cosmo Harrigan
e0f718bbd2 Backport zmq_proxy_steerable and fix error in proxy function prototype. 2014-03-17 17:55:59 -07:00
Pieter Hintjens
1ac53ed1f7 Merge pull request #66 from hintjens/master
Source package did not build
v4.0.4
2014-03-10 22:41:14 +01:00
Pieter Hintjens
7f08204e9f Source package did not build 2014-03-10 22:40:48 +01:00
Pieter Hintjens
2eb63360d6 Merge pull request #64 from hintjens/master
Bumped NEWS for 4.0.4 release
2014-03-10 13:41:48 +01:00
Pieter Hintjens
930ef37738 Bumped NEWS for 4.0.4 release 2014-03-10 13:40:49 +01:00
Pieter Hintjens
e5473a7a69 Merge pull request #63 from hintjens/master
Backported fix for #909
2014-03-03 12:10:18 +01:00
Josh Blum
dd5603d6e9 Updated NEWS for #909 2014-03-03 12:09:40 +01:00
Pieter Hintjens
03dc70c350 Updated for #60 2014-02-13 19:21:42 +01:00
Pieter Hintjens
97292367eb Updated NEWS 2014-02-13 19:20:56 +01:00
Pieter Hintjens
ebbbdf89cb Merge pull request #60 from ricnewton/master
Fix hang on terminate when inproc is connected but never bound
2014-02-13 19:20:28 +01:00
Richard Newton
c7a7de12a3 Backported fix for #888 2014-02-13 14:56:09 +00:00
Pieter Hintjens
e655fd138d Merge pull request #57 from Debian/counter
Fix timestamp counter on s390/s390x
2014-02-05 21:11:10 +01:00
Pieter Hintjens
0e147bb691 Merge pull request #56 from Debian/symbols
Only export zmq_* symbols
2014-02-05 21:10:49 +01:00
Alessandro Ghedini
4b9cd7764a Only export zmq_* symbols 2014-02-05 20:43:13 +01:00
Alessandro Ghedini
2493a99735 Fix timestamp counter on s390/s390x
Fixes #811
2014-02-05 20:42:40 +01:00
Pieter Hintjens
d4f988649d Merge pull request #55 from hintjens/master
Fixed issue #868
2014-02-03 02:55:18 -08:00
Pieter Hintjens
830e022987 Fixed #868 2014-02-03 11:22:22 +01:00
Pieter Hintjens
5a576d22db Updated NEWS for #584 2014-02-03 11:22:22 +01:00
Pieter Hintjens
89c762fb0a Clarified ZMQ_IDENTITY doc for duplicate identities 2014-02-03 11:22:22 +01:00
Pieter Hintjens
0b11c3174e Merge pull request #51 from EricMCornelius/master
Corrects ypipe initialization when conflate is NOT enabled.
2014-01-15 22:11:50 -08:00
Pieter Hintjens
129cb00d8f Update README.md 2014-01-15 21:39:21 +01:00
Pieter Hintjens
6982e69da4 Update README.md 2014-01-15 21:39:00 +01:00
Eric Cornelius
63fe43a101 Corrects ypipe initialization when conflate is NOT enabled. Fixes LIBZMQ-584 2014-01-15 12:18:50 -08:00
Pieter Hintjens
3f3f9dcec2 Merge pull request #47 from vortechs2000/fix_news
Adjust NEWS to include LIBZMQ-576
2014-01-02 14:45:47 -08:00
AJ Lewis
53bef03e7b Adjust NEWS to include LIBZMQ-576 2014-01-02 16:39:03 -06:00
Pieter Hintjens
a37c198c7d Merge pull request #46 from vortechs2000/fix-libzmq-576
Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"
2014-01-02 13:12:18 -08:00
AJ Lewis
047bd130cf Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"
This reverts commit f27eb67e1abb0484c41050e454404cce30647b63, reversing
changes made to a3ae0d4c16c892a4e6c96d626a7c8b7068450336.

Conflicts:
	src/stream_engine.cpp

Conflicts were around additional defaults to the constructor after the
'terminating' default.  The additional defaults were left alone, and
the 'terminating' default was removed.
2014-01-02 11:04:43 -06:00
Pieter Hintjens
5db0acb044 Merge pull request #44 from hintjens/master
Issue 797
2013-12-23 04:18:04 -08:00
Pieter Hintjens
845ee0c7bc Updated NEWS 2013-12-23 13:17:38 +01:00
Alex Grönholm
2ba0d159b5 Fixed setting TCP keepalive parameters on Windows 2013-12-23 13:16:18 +01:00
Pieter Hintjens
571c668fa2 Merge pull request #43 from hintjens/master
Backporting fixes from master
2013-12-06 14:30:23 -08:00
Pieter Hintjens
0552d9119b Updated news for #775 2013-12-05 16:52:36 +01:00
KIU Shueng Chuan
3dc89feafc use enum retired_fd instead of -1
using -1 causes a warning on Windows platform because SOCKET is unsigned.
2013-12-05 16:50:15 +01:00