zeromq3-4.0.4+dfsg.orig/ 0000755 0001750 0001750 00000000000 12307431401 013726 5 ustar ghedo ghedo zeromq3-4.0.4+dfsg.orig/autogen.sh 0000755 0001750 0001750 00000003003 12240736636 015741 0 ustar ghedo ghedo #!/bin/sh
# Copyright (c) 2007-2009 iMatix Corporation
# Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
#
# This file is part of 0MQ.
#
# 0MQ is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# 0MQ is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see .
# Script to generate all required files from fresh git checkout.
command -v libtool >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "autogen.sh: error: could not find libtool. libtool is required to run autogen.sh." 1>&2
exit 1
fi
command -v autoreconf >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "autogen.sh: error: could not find autoreconf. autoconf and automake are required to run autogen.sh." 1>&2
exit 1
fi
mkdir -p ./config
if [ $? -ne 0 ]; then
echo "autogen.sh: error: could not create directory: ./config." 1>&2
exit 1
fi
autoreconf --install --force --verbose -I config
if [ $? -ne 0 ]; then
echo "autogen.sh: error: autoreconf exited with status $?" 1>&2
exit 1
fi
zeromq3-4.0.4+dfsg.orig/zeromq.spec 0000644 0001750 0001750 00000010476 12307431401 016127 0 ustar ghedo ghedo Name: zeromq
Version: 4.0.4
Release: 1%{?dist}
Summary: The ZeroMQ messaging library
Group: Applications/Internet
License: LGPLv3+
URL: http://www.zeromq.org/
Source: http://download.zeromq.org/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc, make, gcc-c++, libstdc++-devel
Requires: libstdc++
%if 0%{?rhel}
%if 0%{?rhel} == 6
BuildRequires: libuuid-devel
Requires: libuuid
%endif
%if 0%{?rhel} == 5
BuildRequires: e2fsprogs-devel
Requires: e2fsprogs
%endif
%else
BuildRequires: uuid-devel
Requires: uuid
%endif
# Build pgm only on supported archs
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
BuildRequires: python, perl
%endif
%description
The 0MQ lightweight messaging kernel is a library which extends the
standard socket interfaces with features traditionally provided by
specialised messaging middleware products. 0MQ sockets provide an
abstraction of asynchronous message queues, multiple messaging
patterns, message filtering (subscriptions), seamless access to
multiple transport protocols and more.
This package contains the ZeroMQ shared library.
%package devel
Summary: Development files and static library for the ZeroMQ library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, pkgconfig
%description devel
The 0MQ lightweight messaging kernel is a library which extends the
standard socket interfaces with features traditionally provided by
specialised messaging middleware products. 0MQ sockets provide an
abstraction of asynchronous message queues, multiple messaging
patterns, message filtering (subscriptions), seamless access to
multiple transport protocols and more.
This package contains ZeroMQ related development libraries and header files.
%prep
%setup -q
%build
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
%configure --with-pgm --with-pic --with-gnu-ld
%else
%configure
%endif
%{__make} %{?_smp_mflags}
%install
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
# Install the package to build area
%{__make} check
%makeinstall
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%clean
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
# docs in the main package
%doc AUTHORS ChangeLog COPYING COPYING.LESSER NEWS README
# libraries
%{_libdir}/libzmq.so.3
%{_libdir}/libzmq.so.3.0.0
%{_mandir}/man7/zmq.7.gz
%files devel
%defattr(-,root,root,-)
%{_includedir}/zmq.h
%{_includedir}/zmq_utils.h
%{_libdir}/libzmq.la
%{_libdir}/libzmq.a
%{_libdir}/pkgconfig/libzmq.pc
%{_libdir}/libzmq.so
%{_mandir}/man3/zmq_bind.3.gz
%{_mandir}/man3/zmq_close.3.gz
%{_mandir}/man3/zmq_connect.3.gz
%{_mandir}/man3/zmq_disconnect.3.gz
%{_mandir}/man3/zmq_ctx_destroy.3.gz
%{_mandir}/man3/zmq_ctx_get.3.gz
%{_mandir}/man3/zmq_ctx_new.3.gz
%{_mandir}/man3/zmq_ctx_set.3.gz
%{_mandir}/man3/zmq_ctx_term.3.gz
%{_mandir}/man3/zmq_msg_recv.3.gz
%{_mandir}/man3/zmq_errno.3.gz
%{_mandir}/man3/zmq_getsockopt.3.gz
%{_mandir}/man3/zmq_init.3.gz
%{_mandir}/man3/zmq_msg_close.3.gz
%{_mandir}/man3/zmq_msg_copy.3.gz
%{_mandir}/man3/zmq_msg_data.3.gz
%{_mandir}/man3/zmq_msg_init.3.gz
%{_mandir}/man3/zmq_msg_init_data.3.gz
%{_mandir}/man3/zmq_msg_init_size.3.gz
%{_mandir}/man3/zmq_msg_move.3.gz
%{_mandir}/man3/zmq_msg_size.3.gz
%{_mandir}/man3/zmq_msg_get.3.gz
%{_mandir}/man3/zmq_msg_more.3.gz
%{_mandir}/man3/zmq_msg_recv.3.gz
%{_mandir}/man3/zmq_msg_send.3.gz
%{_mandir}/man3/zmq_msg_set.3.gz
%{_mandir}/man3/zmq_poll.3.gz
%{_mandir}/man3/zmq_proxy.3.gz
%{_mandir}/man3/zmq_recv.3.gz
%{_mandir}/man3/zmq_recvmsg.3.gz
%{_mandir}/man3/zmq_send.3.gz
%{_mandir}/man3/zmq_sendmsg.3.gz
%{_mandir}/man3/zmq_setsockopt.3.gz
%{_mandir}/man3/zmq_socket.3.gz
%{_mandir}/man3/zmq_socket_monitor.3.gz
%{_mandir}/man3/zmq_strerror.3.gz
%{_mandir}/man3/zmq_term.3.gz
%{_mandir}/man3/zmq_version.3.gz
%{_mandir}/man3/zmq_unbind.3.gz
%{_mandir}/man7/zmq_epgm.7.gz
%{_mandir}/man7/zmq_inproc.7.gz
%{_mandir}/man7/zmq_ipc.7.gz
%{_mandir}/man7/zmq_pgm.7.gz
%{_mandir}/man7/zmq_tcp.7.gz
%changelog
* Mon Nov 26 2012 Justin Cook 3.2.2
- Update packaged files
* Fri Apr 8 2011 Mikko Koppanen 3.0.0-1
- Update dependencies and packaged files
* Sat Apr 10 2010 Mikko Koppanen 2.0.7-1
- Initial packaging
zeromq3-4.0.4+dfsg.orig/ChangeLog 0000644 0001750 0001750 00004457410 12307431401 015517 0 ustar ghedo ghedo # Generated by Makefile. Do not edit.
commit 1ac53ed1f75202bbe36dd0b409736f90984638e5
Merge: 2eb6336 7f08204
Author: Pieter Hintjens
Date: Mon Mar 10 22:41:14 2014 +0100
Merge pull request #66 from hintjens/master
Source package did not build
commit 7f08204e9fa0c98cbf29229167d7a9939f61179c
Author: Pieter Hintjens
Date: Mon Mar 10 22:39:59 2014 +0100
Source package did not build
src/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 2eb63360d60097ca6bca5eeffbc789c72994125c
Merge: e5473a7 930ef37
Author: Pieter Hintjens
Date: Mon Mar 10 13:41:48 2014 +0100
Merge pull request #64 from hintjens/master
Bumped NEWS for 4.0.4 release
commit 930ef3773861170fba44ab2f8cb1a47e5a3a315d
Author: Pieter Hintjens
Date: Mon Mar 10 13:40:49 2014 +0100
Bumped NEWS for 4.0.4 release
NEWS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e5473a7a6998311ef098ca25077ba1a3755df0dd
Merge: ebbbdf8 dd5603d
Author: Pieter Hintjens
Date: Mon Mar 3 12:10:18 2014 +0100
Merge pull request #63 from hintjens/master
Backported fix for #909
commit dd5603d6e95e22e8b9f963680e99e11de6a4de3a
Author: Josh Blum
Date: Wed Feb 12 11:22:37 2014 -0800
Updated NEWS for #909
NEWS | 2 ++
src/Makefile.am | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 03dc70c3507e2e430d5c065cd64f60d8635f8837
Author: Pieter Hintjens
Date: Thu Feb 13 19:21:42 2014 +0100
Updated for #60
NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 97292367ebeb541ae37c83f432bc4970511b6bf9
Author: Pieter Hintjens
Date: Thu Feb 13 09:33:14 2014 +0100
Updated NEWS
NEWS | 4 ++++
1 file changed, 4 insertions(+)
commit ebbbdf89cb29e68119d24acc55d89e4e95bbe638
Merge: e655fd1 c7a7de1
Author: Pieter Hintjens
Date: Thu Feb 13 19:20:28 2014 +0100
Merge pull request #60 from ricnewton/master
Fix hang on terminate when inproc is connected but never bound
commit c7a7de12a351b26c39758db5bc0d310ae6598c24
Author: Richard Newton
Date: Thu Feb 13 14:56:09 2014 +0000
Backported fix for #888
src/ctx.cpp | 10 +++++++++-
tests/test_inproc_connect.cpp | 20 +++++++++++++++++++-
tests/testutil.hpp | 2 +-
3 files changed, 29 insertions(+), 3 deletions(-)
commit e655fd138d948800df80959d71da12738a1c4bc1
Merge: 0e147bb 2493a99
Author: Pieter Hintjens
Date: Wed Feb 5 21:11:10 2014 +0100
Merge pull request #57 from Debian/counter
Fix timestamp counter on s390/s390x
commit 0e147bb69144856b81816d57c570aa867e76a2eb
Merge: d4f9886 4b9cd77
Author: Pieter Hintjens
Date: Wed Feb 5 21:10:49 2014 +0100
Merge pull request #56 from Debian/symbols
Only export zmq_* symbols
commit 4b9cd7764ab7ee6b9c82f216f0c8801493f33fa2
Author: Alessandro Ghedini
Date: Sun Jan 12 12:30:45 2014 +0100
Only export zmq_* symbols
src/Makefile.am | 2 +-
src/libzmq.vers | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
commit 2493a9973582cb079a2bda5beeb8b1f3e9332b48
Author: Alessandro Ghedini
Date: Sun Jan 12 12:31:31 2014 +0100
Fix timestamp counter on s390/s390x
Fixes #811
src/clock.cpp | 1 -
1 file changed, 1 deletion(-)
commit d4f988649da12415e431001fb7c0b748d4742714
Merge: 0b11c31 830e022
Author: Pieter Hintjens
Date: Mon Feb 3 02:55:18 2014 -0800
Merge pull request #55 from hintjens/master
Fixed issue #868
commit 830e0229875791641e449ec1429c7e6a7f3fd163
Author: Pieter Hintjens
Date: Mon Feb 3 11:20:58 2014 +0100
Fixed #868
NEWS | 2 ++
src/ip.cpp | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
commit 5a576d22dbc3efa3e50832d61a5d73abc02ece28
Author: Pieter Hintjens
Date: Thu Jan 16 07:13:29 2014 +0100
Updated NEWS for #584
NEWS | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 89c762fb0ae0f7a62b70be12d07139190bf52d97
Author: Pieter Hintjens
Date: Wed Jan 1 13:43:14 2014 +0100
Clarified ZMQ_IDENTITY doc for duplicate identities
doc/zmq_setsockopt.txt | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
commit 0b11c3174ef4e096dec07d0b4f62bbbeda93933e
Merge: 129cb00 63fe43a
Author: Pieter Hintjens
Date: Wed Jan 15 22:11:50 2014 -0800
Merge pull request #51 from EricMCornelius/master
Corrects ypipe initialization when conflate is NOT enabled.
commit 129cb00d8f04391fce7db3ba6732cf4fa0be2844
Author: Pieter Hintjens
Date: Wed Jan 15 21:39:21 2014 +0100
Update README.md
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6982e69da4acc720f23bce6c7b8fb005ea4bbabe
Author: Pieter Hintjens
Date: Wed Jan 15 21:39:00 2014 +0100
Update README.md
README.md | 6 ++++++
1 file changed, 6 insertions(+)
commit 63fe43a101ac0e70cb254463a4e76081f175d775
Author: Eric Cornelius
Date: Wed Jan 15 12:18:50 2014 -0800
Corrects ypipe initialization when conflate is NOT enabled. Fixes LIBZMQ-584
src/pipe.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3f3f9dcec23d4927586a4bf37afe3ee27efa2169
Merge: a37c198 53bef03
Author: Pieter Hintjens
Date: Thu Jan 2 14:45:47 2014 -0800
Merge pull request #47 from vortechs2000/fix_news
Adjust NEWS to include LIBZMQ-576
commit 53bef03e7bc8199da915d76394f39dff4f257f04
Author: AJ Lewis
Date: Thu Jan 2 16:39:03 2014 -0600
Adjust NEWS to include LIBZMQ-576
NEWS | 2 ++
1 file changed, 2 insertions(+)
commit a37c198c7db547129bb47d02597ee5669183478b
Merge: 5db0acb 047bd13
Author: Pieter Hintjens
Date: Thu Jan 2 13:12:18 2014 -0800
Merge pull request #46 from vortechs2000/fix-libzmq-576
Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"
commit 047bd130cfd885ce76d4c04914adaa5333f4efe7
Author: AJ Lewis
Date: Thu Jan 2 11:04:43 2014 -0600
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.
src/encoder.hpp | 5 -----
src/i_encoder.hpp | 1 -
src/stream_engine.cpp | 12 ------------
src/stream_engine.hpp | 1 -
4 files changed, 19 deletions(-)
commit 5db0acb044ae8feb04f8ba6ae679d7a6050bd009
Merge: 571c668 845ee0c
Author: Pieter Hintjens
Date: Mon Dec 23 04:18:04 2013 -0800
Merge pull request #44 from hintjens/master
Issue 797
commit 845ee0c7bc4a189f612b7a6577454924bce26d56
Author: Pieter Hintjens
Date: Mon Dec 23 13:17:38 2013 +0100
Updated NEWS
NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 2ba0d159b598e4e7886c917cfb63b48d77991403
Author: Alex Grönholm
Date: Sun Dec 22 02:55:18 2013 +0200
Fixed setting TCP keepalive parameters on Windows
src/tcp.cpp | 30 ++++++++++--------------------
src/windows.hpp | 1 +
2 files changed, 11 insertions(+), 20 deletions(-)
commit 571c668fa2e0b101f607b4c4a34c30da2f174499
Merge: 97e1ecc 0552d91
Author: Pieter Hintjens
Date: Fri Dec 6 14:30:23 2013 -0800
Merge pull request #43 from hintjens/master
Backporting fixes from master
commit 0552d9119bada6a132a612e8284eb82a58ba26b0
Author: Pieter Hintjens
Date: Thu Dec 5 16:52:36 2013 +0100
Updated news for #775
NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 3dc89feafcee31ef5169d827015f1fe2a18da08b
Author: KIU Shueng Chuan
Date: Thu Dec 5 07:04:21 2013 +0800
use enum retired_fd instead of -1
using -1 causes a warning on Windows platform because SOCKET is unsigned.
src/socket_base.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 97e1ecce228c1465d619db7c3c5a11a9dd36670c
Merge: 8b9a824 d958b67
Author: Pieter Hintjens
Date: Sun Dec 1 02:55:48 2013 -0800
Merge pull request #40 from hintjens/master
Backported fix for #763
commit d958b675c7918c05b92c3e0cfbd49601142cdefd
Author: Pieter Hintjens
Date: Sun Dec 1 11:54:55 2013 +0100
Updated NEWS for #763
NEWS | 10 ++++++++++
1 file changed, 10 insertions(+)
commit ff8f97e7d770651ef2e50e6f2a36069ae78e7814
Author: Martin Hurton
Date: Sat Nov 30 21:24:32 2013 +0100
Fix issue #763
src/stream_engine.cpp | 7 +++++++
1 file changed, 7 insertions(+)
commit 75ba4c7292bc09e7fc58dd206447777391d06100
Author: Pieter Hintjens
Date: Sun Nov 24 19:00:18 2013 +0100
Updated version number for release 4.0.4
include/zmq.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8b9a82476b196a200b9698c9345ae8ba50cccb1c
Merge: 78b741b 4363b75
Author: Pieter Hintjens
Date: Sun Nov 24 09:58:59 2013 -0800
Merge pull request #37 from hintjens/master
Fixed test_many_sockets
commit 4363b75b4d9aec70b297e96d4b933110ce161a62
Author: Pieter Hintjens
Date: Sun Nov 24 18:56:50 2013 +0100
Release notes for 4.0.3
NEWS | 10 ++++++++++
include/zmq.h | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
commit c022c048dcbe15a2757ab90d2d03d89f615744a8
Author: Pieter Hintjens
Date: Tue Nov 19 16:51:06 2013 +0100
Fixed test_many_sockets
* failed on systems where process could not allocate 1024 sockets by default
* include path for platform.hpp was wrong; fixed it
tests/test_many_sockets.cpp | 73 ++++++++++++++++++-------------------------
tests/testutil.hpp | 2 +-
2 files changed, 32 insertions(+), 43 deletions(-)
commit 78b741bd71995c7b73a2cbe449f2c6028610f7e4
Merge: d743dda ba7c065
Author: Pieter Hintjens
Date: Sun Nov 24 03:47:58 2013 -0800
Merge pull request #36 from hintjens/master
Updated version number for 4.0.2
commit ba7c065c3dd13453c79d7a07efa1c6c3e56bdf18
Author: Pieter Hintjens
Date: Sun Nov 24 12:45:47 2013 +0100
Updated version number for 4.0.2
- also moved macros to top of zmq.h for better visibility
include/zmq.h | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
commit d743ddafda6dd45f178cd6c8bd98c32b1aa4c49b
Merge: e193915 84c0caf
Author: Pieter Hintjens
Date: Sun Nov 24 03:42:01 2013 -0800
Merge pull request #35 from hintjens/master
Updated NEWS for release 4.0.2
commit 84c0caf42eae2e1871d880bfd6722a5011c8e531
Author: Pieter Hintjens
Date: Sun Nov 24 12:41:16 2013 +0100
Updated NEWS for release 4.0.2
NEWS | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit e1939155ff4aab3c7d543e0ef089349a10814895
Merge: 30309d6 9ece2d3
Author: Pieter Hintjens
Date: Tue Nov 19 02:01:23 2013 -0800
Merge pull request #34 from hintjens/master
Backporting fixes from master
commit 9ece2d322a6189d02f1a57bf499dda8510665d16
Author: Pieter Hintjens
Date: Wed Nov 13 13:57:53 2013 +0100
Added links to RFCs for socket patterns
doc/zmq_socket.txt | 4 ++++
1 file changed, 4 insertions(+)
commit 589bf436dd08066b7a7fdd608c31c41b9a15b936
Author: KIU Shueng Chuan
Date: Tue Nov 12 01:12:24 2013 +0800
remove all asserts during critical section
the size of the critical section is reduced by only entering the critical
section right before the bind().
src/signaler.cpp | 76 ++++++++++++++++++++++--------------------------------
1 file changed, 31 insertions(+), 45 deletions(-)
commit e54e55835e6caa07a5805e1b7d1e7e6e5e098b74
Author: KIU Shueng Chuan
Date: Tue Nov 12 00:07:06 2013 +0800
return error to caller on bind error
src/signaler.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 111c20dc22709e58ff2c5718c04210eee1a359e5
Author: Richard Newton
Date: Mon Nov 11 13:54:58 2013 +0000
Fix signed/unsigned comparison
tests/test_many_sockets.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3a4896f4a36e6df2d2f7b62b1d64ef7d74774a90
Author: Richard Newton
Date: Mon Nov 11 13:53:25 2013 +0000
Fix signed/unsigned comparison
tests/test_many_sockets.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0855c28069bd87f4c50ecb5606641522654f97a1
Author: Richard Newton
Date: Mon Nov 11 13:41:42 2013 +0000
Reduce default maximum number of sockets by 1 so there is room for the reaper socket.
include/zmq.h | 2 +-
tests/test_many_sockets.cpp | 79 +++++++++++++++++++++++++++++++++++--------
2 files changed, 65 insertions(+), 16 deletions(-)
commit 737b6afc97ef959480fb2ae69192eb8965fe99d6
Author: Richard Newton
Date: Mon Nov 11 13:09:23 2013 +0000
Revert "Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket."
This reverts commit 0b92831b2a82c3bbc0e9371662c546b94915a3ea.
CMakeLists.txt | 2 +-
builds/mingw32/Makefile.mingw32 | 2 +-
builds/msvc/libzmq/libzmq.vcproj | 10 +++++-----
builds/msvc/properties/ZeroMQ.props | 2 +-
builds/msvc/properties/ZeroMQ_Static.props | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
commit 8f85bafe372d96212764a51737835fef82e035a8
Author: psl-felipefarinon
Date: Mon Nov 11 10:20:28 2013 -0200
issue #583 removing C++11 code.
src/clock.cpp | 1 -
1 file changed, 1 deletion(-)
commit f72dbb35d5e9d864acb1634f96c7efd7f4ead15f
Author: Bruno D. Rodrigues
Date: Sun Nov 10 10:19:19 2013 +0000
Fix socket creation above sistem limits for all 'other' OS not covered by eventfd, windows or vms; enhanced test to create sockets up to a bigger limit to really test hitting the OS limit
src/signaler.cpp | 2 +-
tests/test_many_sockets.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
commit 5d6e7a74c1e50559f0ee3cb37dc61e21ea818c67
Author: Pieter Hintjens
Date: Sat Nov 9 09:59:21 2013 +0100
Added test case to ignore
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit 30309d660e4d3ef72d677ad059ed57f0ca80471c
Merge: f745e4c e0c8a11
Author: Pieter Hintjens
Date: Sat Nov 9 00:56:52 2013 -0800
Merge pull request #32 from hintjens/master
Cherry picking changes from libzmq master
commit e0c8a112a43cd13bd3e21696b26e0357037d4759
Author: Pieter Hintjens
Date: Sat Nov 9 09:56:21 2013 +0100
Cherry picking fixes from master
.gitignore | 1 +
NEWS | 13 +++++++------
tests/Makefile.am | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
commit f6293d257d9f649ef82ce40850d1b18cca9a89dd
Author: Martin Hurton
Date: Wed Oct 9 10:51:30 2013 +0200
Signal that the peer performed orderly shutdown
src/stream_engine.cpp | 77 +++++++++++++++++++++++--------------------------
src/stream_engine.hpp | 7 ++---
2 files changed, 39 insertions(+), 45 deletions(-)
commit f33bdcf02e4781943a5c000af707a0d011d59b8f
Author: Richard Newton
Date: Thu Nov 7 17:50:29 2013 +0000
Fix formatting.
src/ctx.cpp | 8 ++++----
src/devpoll.cpp | 2 +-
src/devpoll.hpp | 2 +-
src/epoll.cpp | 2 +-
src/epoll.hpp | 2 +-
src/kqueue.cpp | 2 +-
src/kqueue.hpp | 2 +-
src/poll.cpp | 2 +-
src/poll.hpp | 2 +-
src/select.cpp | 2 +-
src/select.hpp | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
commit fef24a8c1f5c1f806c11e35eb8d93e1fc334bb47
Author: Richard Newton
Date: Thu Nov 7 18:26:13 2013 +0000
Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket.
CMakeLists.txt | 2 +-
builds/mingw32/Makefile.mingw32 | 2 +-
builds/msvc/libzmq/libzmq.vcproj | 10 +++++-----
builds/msvc/properties/ZeroMQ.props | 2 +-
builds/msvc/properties/ZeroMQ_Static.props | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
commit bfc3deb43a271e13c0cb44ed0694fdd80848298d
Author: Richard Newton
Date: Thu Nov 7 17:46:19 2013 +0000
Get maximum number of sockets it can handle from poller_t
src/ctx.cpp | 12 ++++++++++--
src/devpoll.cpp | 5 +++++
src/devpoll.hpp | 2 ++
src/epoll.cpp | 5 +++++
src/epoll.hpp | 2 ++
src/kqueue.cpp | 5 +++++
src/kqueue.hpp | 2 ++
src/poll.cpp | 5 +++++
src/poll.hpp | 2 ++
src/select.cpp | 5 +++++
src/select.hpp | 2 ++
11 files changed, 45 insertions(+), 2 deletions(-)
commit dccf1dce1e12109adc669b68a80398c3b927b804
Author: psl-felipefarinon
Date: Thu Nov 7 15:21:42 2013 -0200
Fixing broken build issue #583
src/clock.cpp | 2 ++
1 file changed, 2 insertions(+)
commit 24311dee1b8b53b9280a255e5a05b180f812afdf
Author: Richard Newton
Date: Thu Nov 7 16:47:55 2013 +0000
Add test case for many sockets
Conflicts:
CMakeLists.txt
tests/Makefile.am
CMakeLists.txt | 4 +++-
tests/Makefile.am | 5 ++++-
tests/test_many_sockets.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 2 deletions(-)
commit 27d20aacc7563ffa376198acb1a509c4fb35f4fb
Author: psl-felipefarinon
Date: Thu Nov 7 14:06:54 2013 -0200
Fixing issue #583. Using low resolution timer for clock::now_ms
src/clock.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 56 insertions(+), 2 deletions(-)
commit b2698474d2b0036ad27b9056d703e864bd96b706
Author: Pieter Hintjens
Date: Thu Nov 7 15:30:25 2013 +0100
Simplified fdpair reset after fork
src/signaler.cpp | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
commit 0465e9abe922db5f47e50998c0d495351373b1c1
Author: Pieter Hintjens
Date: Thu Nov 7 15:26:56 2013 +0100
Simplified error handling for make_fdpair on Windows
src/signaler.cpp | 7 -------
1 file changed, 7 deletions(-)
commit 885c816e5718c406d18cbccbc4093b0e46761821
Author: Pieter Hintjens
Date: Thu Nov 7 14:59:53 2013 +0100
Fix for issue 574
src/signaler.cpp | 89 ++++++++++++++++++++++++++-------------------------
src/signaler.hpp | 4 +--
src/socket_base.cpp | 82 ++++++++++++++++++++++++-----------------------
3 files changed, 89 insertions(+), 86 deletions(-)
commit 7f3d0995cda22fd504bbf106a719a8f8c755ce96
Author: Pieter Hintjens
Date: Wed Nov 6 13:30:41 2013 +0100
Removed over-long pauses in tests
- used msleep (10) in most places instead of zmq_sleep (1)
- may cause failures on slower machines
- to change, modify SETTLE_TIME in testutil.h
- tested down to 1 msec on fast boxes
Conflicts:
tests/test_connect_delay_tipc.cpp
tests/test_proxy.cpp
tests/test_sub_forward_tipc.cpp
tests/test_term_endpoint_tipc.cpp
tests/testutil.hpp
tests/test_conflate.cpp | 7 ++-----
tests/test_ctx_destroy.cpp | 2 +-
tests/test_immediate.cpp | 3 +--
tests/test_inproc_connect.cpp | 2 +-
tests/test_iov.cpp | 2 +-
tests/test_monitor.cpp | 6 +++---
tests/test_req_relaxed.cpp | 2 +-
tests/test_spec_req.cpp | 2 +-
tests/test_sub_forward.cpp | 2 +-
tests/test_term_endpoint.cpp | 4 ++--
tests/testutil.hpp | 17 +++++++++++++++++
11 files changed, 31 insertions(+), 18 deletions(-)
commit f745e4ce64d772c40fa7622568f886984f5c7ce2
Merge: 806f57e de239f3
Author: Pieter Hintjens
Date: Wed Nov 6 11:26:05 2013 -0800
Merge pull request #31 from hintjens/master
Backported fixes for libzmq-39 and other patches.
commit de239f358e02c4d42a2c4426ffee893e101c90b2
Author: Richard Newton
Date: Wed Nov 6 15:19:04 2013 +0000
Fix race condition on shutdown
src/ctx.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit 30f470eff56d4b7f778cd83bda0ea689cf752a41
Author: Richard Newton
Date: Mon Oct 28 08:34:32 2013 +0000
Fix test warning.
tests/test_ctx_options.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f0b69bba286dcd9689e40674a84cf1ab940a2d81
Author: Richard Newton
Date: Mon Oct 28 08:30:31 2013 +0000
Fix test warning.
tests/test_router_raw_empty.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 60032ef3301316ef00e9bce4f34a9a22d075b83e
Author: MinRK
Date: Sun Oct 27 22:50:32 2013 -0700
test zmq_msg_close after sending empty message on ROUTER_RAW
tests/Makefile.am | 2 ++
tests/test_router_raw_empty.cpp | 65 +++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
commit c663f37761c7bebd0061061ede13a4e9aef5b6f4
Author: MinRK
Date: Sun Oct 27 22:50:04 2013 -0700
add missing msg->init for ROUTER_RAW with empty message
src/router.cpp | 2 ++
1 file changed, 2 insertions(+)
commit 806f57e7f6e93a4c3e333e63fab8cfc003a29368
Merge: 28b7c99 b22c2e4
Author: Pieter Hintjens
Date: Mon Nov 4 08:44:38 2013 -0800
Merge pull request #30 from hintjens/master
Cherry picking fixes from libzmq
commit b22c2e4f8a8c11bfbbe74c43134a481b3a90d104
Author: Pieter Hintjens
Date: Mon Nov 4 17:37:15 2013 +0100
Updated NEWS
NEWS | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 54a3ebcac656d9451e7a3b59f092b1949c9e9ac7
Author: Denis Mingulov
Date: Mon Nov 4 15:15:23 2013 +0200
Doc examples with zmq_msg_close usage - parameter is 'zmq_msg_t *'
Documentation examples for zmq_msg_get and zmq_msg_more functions have an
incorrect call to zmq_msg_close function - with 'zmq_msg_t' as a parameter
despite 'zmq_msg_t *' is required, so it is impossible to compile these
examples properly.
Also for zmq_msg_get example - declaration of zmq_msg_t variable is added
(like it is done in other examples).
doc/zmq_msg_get.txt | 3 ++-
doc/zmq_msg_more.txt | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
commit aede37e3e5913b6c8abdd286c2991f2784344140
Author: Pieter Hintjens
Date: Mon Nov 4 16:04:13 2013 +0100
Fixed issue 578 - corrected type usage
src/zmq_utils.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2949f2dbc5c1e73ab50333fb4fae60852bf21c85
Author: Pieter Hintjens
Date: Mon Nov 4 15:39:20 2013 +0100
Fixed issue 578
.gitignore | 9 +++++++++
src/zmq_utils.cpp | 11 ++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
commit 28b7c991afe738a88d7f6d0340987898e06b0c7a
Merge: c85fbaf 1c70e91
Author: Pieter Hintjens
Date: Mon Oct 28 03:58:52 2013 -0700
Merge pull request #28 from hintjens/master
Fixed configure error on non-Linux boxes
commit 1c70e91c6f0db4418b4ff4eccf935af667ddbfeb
Author: Pieter Hintjens
Date: Mon Oct 28 11:58:29 2013 +0100
Fixed configure error on non-Linux boxes
tests/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c85fbaf22e5f8ff79039ee2d87dd455484979b75
Merge: cb3c822 b580557
Author: Pieter Hintjens
Date: Mon Oct 28 03:49:45 2013 -0700
Merge pull request #27 from hintjens/master
Fixed ref to zmq_socket_monitor
commit b58055794bda1c25be7b7d9829f96913f1ce2758
Author: Pieter Hintjens
Date: Mon Oct 28 11:49:23 2013 +0100
Fixed ref to zmq_socket_monitor
NEWS | 2 +-
doc/zmq.txt | 6 +++---
tests/Makefile.am | 3 ---
3 files changed, 4 insertions(+), 7 deletions(-)
commit cb3c82271a7a34ab0ebe0d3353105ba2c14a2d35
Merge: bf97ea8 9bf10a8
Author: Pieter Hintjens
Date: Fri Oct 25 01:04:06 2013 -0700
Merge pull request #26 from hintjens/master
Backporting fixes from master
commit 9bf10a83a17a900640f4658a3ce9b695359a70ce
Author: Pieter Hintjens
Date: Fri Oct 25 10:03:42 2013 +0200
Updated NEWS
NEWS | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 8efd7affc677cb9d40167137b27d99e9b670affc
Author: Pieter Hintjens
Date: Wed Oct 23 23:58:39 2013 +0200
test_stream failed when response was broken into frames
tests/test_stream.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
commit bf97ea8ed8ecb5b3d13e7a0c7ace631437f7151e
Merge: 2b8d86c cd2afeb
Author: Pieter Hintjens
Date: Wed Oct 23 07:04:20 2013 -0700
Merge pull request #25 from hintjens/master
Clarified use of secret/public keys
commit cd2afebd0a0f9861f4d90282029822d94aa1c979
Author: Pieter Hintjens
Date: Wed Oct 23 16:03:45 2013 +0200
Clarified use of secret/public keys
doc/zmq_setsockopt.txt | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
commit 2b8d86c24a092d8622643ea68830daa6477ee227
Merge: 573d7b0 bd411bb
Author: Pieter Hintjens
Date: Wed Oct 23 03:05:44 2013 -0700
Merge pull request #24 from hintjens/master
Fixed man page for CURVE key options
commit bd411bbf116d491e08eef9172dee1bc6786196e3
Author: Pieter Hintjens
Date: Wed Oct 23 12:04:50 2013 +0200
Fixed man page for CURVE key options
doc/zmq_setsockopt.txt | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
commit 573d7b0c0b8abd4a4e616d503f8a2c80a1ecaf40
Merge: 07d7cf6 dcb9312
Author: Pieter Hintjens
Date: Sun Oct 13 23:05:54 2013 -0700
Merge pull request #23 from hintjens/master
Backporting LIBZMQ-569 fix from master
commit dcb9312ba697b3dcb0912344f27d5665ced7d8a2
Author: Pieter Hintjens
Date: Mon Oct 14 08:04:57 2013 +0200
Updated NEWS for backport
NEWS | 9 +++++++++
1 file changed, 9 insertions(+)
commit 54907946664d6eed2e12e7e9eda7de3f4d9f290f
Author: Martin Hurton
Date: Fri Jun 21 16:23:38 2013 +0200
Load identity message to decoder at start
src/stream_engine.cpp | 7 +++++++
1 file changed, 7 insertions(+)
commit 07d7cf69d03635cb249fc01e082d68669b4f26a6
Merge: 4f2ac39 b24db36
Author: Pieter Hintjens
Date: Sun Oct 13 05:47:11 2013 -0700
Merge pull request #22 from hintjens/master
Temporary workaround for broken libsodium install
commit b24db360570c335b9f420b07574dd0c9873e6136
Author: Pieter Hintjens
Date: Sun Oct 13 14:46:08 2013 +0200
Temporary workaround for broken libsodium install
.travis.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 4f2ac39d2822c5d30554a56db4dbd58b7bb534d5
Merge: 8cdff6f a32c02a
Author: Pieter Hintjens
Date: Fri Oct 11 03:12:27 2013 -0700
Merge pull request #21 from hintjens/master
Backporting fixes from master
commit a32c02ae47484a6b60fb7895fb0b9ee39573fc10
Author: Pieter Hintjens
Date: Wed Oct 9 19:52:46 2013 +0200
Identity can only be set on sockets that can connect to ROUTER
doc/zmq_getsockopt.txt | 6 +++---
doc/zmq_setsockopt.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
commit 622e3b54760a78d6f7d14cc5b1ceba99f3e690ad
Author: Martin Hurton
Date: Thu Sep 26 09:37:04 2013 +0200
Rename engine's methods to improve code readability
src/i_engine.hpp | 4 ++--
src/pgm_receiver.cpp | 4 ++--
src/pgm_receiver.hpp | 4 ++--
src/pgm_sender.cpp | 4 ++--
src/pgm_sender.hpp | 4 ++--
src/session_base.cpp | 4 ++--
src/stream_engine.cpp | 34 +++++++++++++++++-----------------
src/stream_engine.hpp | 8 ++++----
8 files changed, 33 insertions(+), 33 deletions(-)
commit 6c036b39ae7de197473c43c5f8de79657b0e8ae6
Author: xantares
Date: Thu Oct 10 22:08:54 2013 +0200
Fixed out-of-source build
tools/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8cdff6fa2e06763bb430a04f4159135e558ca001
Author: Pieter Hintjens
Date: Tue Oct 8 17:54:41 2013 +0200
Fixed NEWS
NEWS | 3 ---
1 file changed, 3 deletions(-)
commit f8cebb460a94ddee613fd7f4ed23300f9cc790ba
Author: Pieter Hintjens
Date: Tue Oct 8 15:02:58 2013 +0200
Revert "replace macro constants with enum types for user facing constants"
This reverts commit 4fb74539250d83e82e40e85d39e2e756eccdb8a3.
include/zmq.h | 222 ++++++++++++++++++++++++++-------------------------------
1 file changed, 101 insertions(+), 121 deletions(-)
commit d62e7a0734b7a69e199bfa22209275ab5da7a639
Author: Pieter Hintjens
Date: Tue Oct 8 15:02:47 2013 +0200
Revert "distinguish between options and defaults"
This reverts commit e7db680f5b709ce821f79b1e8956f4cbd1931c11.
include/zmq.h | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
commit a44bd65d03f1d6a79bf818584c0ae37ef46478d4
Author: Pieter Hintjens
Date: Tue Oct 8 10:46:47 2013 +0200
Fixed NEWS for 4.0.1 release
NEWS | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
commit 437e4070a37367a4d6c272b4c39ea9b92c31c2b3
Merge: c852620 0bfcd4d
Author: Pieter Hintjens
Date: Tue Oct 8 01:36:58 2013 -0700
Merge pull request #19 from hintjens/master
Updated NEWS for 4.0.1
commit 0bfcd4da2f50c215836c878d00175e73e6fa4d46
Author: Pieter Hintjens
Date: Tue Oct 8 10:33:50 2013 +0200
Updated NEWS for 4.0.1
NEWS | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
commit c852620f5f33d50698817be0b66f85fbc7ac59a3
Merge: 163aebb ca122e9
Author: Pieter Hintjens
Date: Tue Oct 8 00:20:40 2013 -0700
Merge pull request #18 from hintjens/master
Cherry picking changes from libzmq master
commit ca122e9d01f44194bb2a107ed1f8275a0b17c319
Author: Volodymyr Korniichuk <9173519@gmail.com>
Date: Tue Oct 8 00:40:30 2013 +0300
Typo in type name "emTPy_slots_t"
https://zeromq.jira.com/browse/LIBZMQ-565
src/ctx.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e7db680f5b709ce821f79b1e8956f4cbd1931c11
Author: Dylan Cali
Date: Fri Oct 4 02:19:07 2013 -0500
distinguish between options and defaults
include/zmq.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 4fb74539250d83e82e40e85d39e2e756eccdb8a3
Author: Dylan Cali
Date: Fri Oct 4 01:45:42 2013 -0500
replace macro constants with enum types for user facing constants
include/zmq.h | 222 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 121 insertions(+), 101 deletions(-)
commit 813166019e1c6955776ff3fab1918b1b4b4c5445
Author: Brandon Carpenter
Date: Mon Oct 7 10:55:40 2013 -0700
Add tests/test_abstract_ipc to .gitignore.
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit 127cd7585a992a2f9a2a30c172f624fd2dc1196e
Author: Brandon Carpenter
Date: Mon Oct 7 10:42:39 2013 -0700
Fix detection of abstract ipc pathname and length calculation.
Abstract socket pathnames must have a NULL character in the first
position, but the second character must also be checked to differentiate
an abstract name from the empty string. The address length must also
indicate the length of the pathname because the kernel uses the entire
address as the name, including NULL characters. ZMQ uses
NULL-terminated strings for the address, so the abstract address length
is the length of the string following the initial NULL byte plus 3; two
bytes for the address family and one for the initial NULL character.
src/ipc_address.cpp | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
commit 0666152b216fe20e54c082461924e034af2efd11
Author: Brandon Carpenter
Date: Mon Oct 7 10:41:20 2013 -0700
Add note on Linux abstract namespace to ipc documentation.
doc/zmq_ipc.txt | 5 +++++
1 file changed, 5 insertions(+)
commit 9293153f71e7fa9c34eecb3951fc08f71c9630bb
Author: Volodymyr Korniichuk
Date: Fri Oct 4 21:54:52 2013 +0300
useless checks were removed
src/ctx.cpp | 6 ++----
src/mtrie.cpp | 3 +--
src/session_base.cpp | 3 +--
src/stream_engine.cpp | 9 +++------
src/trie.cpp | 3 +--
src/yqueue.hpp | 6 ++----
6 files changed, 10 insertions(+), 20 deletions(-)
commit 163aebbacfc904bf5b29454a641ddb7a597b3552
Merge: b20573c 80d657a
Author: Pieter Hintjens
Date: Sat Oct 5 00:20:49 2013 -0700
Merge pull request #17 from hintjens/master
Cherry picking changes from libzmq master
commit 80d657a2c529a1d847eab4cf6285c2279aae208c
Author: Brandon Carpenter
Date: Thu Oct 3 16:35:30 2013 -0700
Add test for abstract namespace support in ipc sockets on Linux.
See issue 567.
configure.ac | 3 +++
tests/Makefile.am | 8 +++++-
tests/test_abstract_ipc.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 1 deletion(-)
commit 668f000cb148ee9e06b90d3b0b9504a16a3e7c52
Author: Brandon Carpenter
Date: Thu Oct 3 16:21:42 2013 -0700
Add abstract namespace support for IPC sockets on Linux.
Converts an initial strudel or "at sign" (@) in the Unix socket path to
a NULL character ('\0') indicating that the socket uses the abstract
namespace instead of the filesystem namespace. For instance, binding a
socket to 'ipc://@/tmp/tester' will not create a file associated with
the socket whereas binding to 'ipc:///tmp/tester' will create the file
/tmp/tester. See issue 567 for more information.
AUTHORS | 1 +
src/ipc_address.cpp | 12 ++++++++++++
2 files changed, 13 insertions(+)
commit a570b18931b52ac1d4b26eef88fe7dc630a4d192
Author: KIU Shueng Chuan
Date: Sat Oct 5 00:51:47 2013 +0800
WinSock2.h filename should be all lowercase
tests/test_system.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5493d4d180924f67c755e2c44d615910b25402ce
Author: KIU Shueng Chuan
Date: Sat Oct 5 00:48:52 2013 +0800
test for _MSC_VER before using MSVC specific code
tests/testutil.hpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit b20573c8412f822cde267d93cccb981815251501
Merge: 34471cd 814b93e
Author: Pieter Hintjens
Date: Fri Oct 4 00:19:57 2013 -0700
Merge pull request #16 from hintjens/master
Cherry picking changes from libzmq master
commit 814b93e0cff2e2437c6b33b2bcb007ad79ad42ee
Author: Martin Hurton
Date: Fri Oct 4 08:20:55 2013 +0200
Stop curve handshake when cookie box verification fails
src/curve_server.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d723b08c134e5f07897c48aaa99fc0b7b2afff02
Author: Pieter Hintjens
Date: Tue Sep 24 15:31:10 2013 +0200
Updated libzmq CURVE to track RFC 27
* The INITIATE command vouch box is Box[C',S](C->S') instead of Box[C'](C->S),
as recommended by https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/,
to reduce the risk of client impersonation.
* Mirrors the change in libcurve and CurveZMQ specifications.
src/curve_client.cpp | 25 ++++++++++++++-----------
src/curve_server.cpp | 26 ++++++++++++--------------
2 files changed, 26 insertions(+), 25 deletions(-)
commit 62fd6fa8614f86a25ab9f4b2a3fab548c7eb6eaa
Author: Matt Connolly
Date: Tue Sep 24 08:07:10 2013 +1000
git ignore test run output files: tests/test*.{log|trs}
.gitignore | 2 ++
1 file changed, 2 insertions(+)
commit a78ccf293fbef3d18e05e904a78d54bb7b2d7e0c
Author: Pieter Hintjens
Date: Wed Oct 2 12:15:31 2013 +0200
Disabled randomly failing part of test
tests/test_spec_rep.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit d82ba6bd534e20fbad35bae1e8504624967e02fb
Author: Pieter Hintjens
Date: Wed Oct 2 12:05:14 2013 +0200
Clarified that zmq.h constants are part of the public contract
include/zmq.h | 8 ++++++++
1 file changed, 8 insertions(+)
commit 9da52ddf59127858e89f5c6ca7e54dcd1c769f1e
Author: Dylan Cali
Date: Wed Oct 2 02:59:44 2013 -0500
fix minor typo in zmq_ctx_get doc example
doc/zmq_ctx_get.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a69fa9ecde029db8052cc2df94e4f7ae1eca26ba
Author: Pieter Hintjens
Date: Mon Sep 30 15:14:02 2013 +0200
Packaging for zmq_curve_keypair function
* Added new man page for this
* Added test case, in tests/test_security_curve.cpp
* Noted in zmq_utils.h that these methods are documented
doc/Makefile.am | 2 +-
doc/zmq.txt | 9 +++++++
doc/zmq_curve_keypair.txt | 56 +++++++++++++++++++++++++++++++++++++++++
doc/zmq_z85_decode.txt | 2 +-
doc/zmq_z85_encode.txt | 1 +
include/zmq_utils.h | 24 ++++++++++--------
tests/test_security_curve.cpp | 24 ++++++++++++------
7 files changed, 98 insertions(+), 20 deletions(-)
commit facb96ffca8a6ef505348ba449dd447ba2dcb52e
Author: MinRK
Date: Sun Sep 29 13:05:27 2013 -0700
use zmq_curve_keypair in curve_keygen
tools/curve_keygen.c | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
commit 3c469d04c1e4879610fae795046c7373abdabd2a
Author: MinRK
Date: Sun Sep 29 13:07:51 2013 -0700
return NULL and set EINVAL on bad z85 input
asserts aren't appropriate for checking user input.
src/zmq_utils.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
commit 870233522c4be1202ba2ed333f32d1c2738698d4
Author: MinRK
Date: Sun Sep 29 13:02:39 2013 -0700
add zmq_curve_keypair to zmq_utils
include/zmq_utils.h | 4 ++++
src/zmq_utils.cpp | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 40 insertions(+), 1 deletion(-)
commit 34471cd59110d5adb9d428a93db3df45ae9a4ec8
Merge: 17d12a6 453ceb6
Author: Pieter Hintjens
Date: Sun Sep 29 08:04:10 2013 -0700
Merge pull request #12 from hintjens/master
Backporting fixes from master
commit 453ceb65b4a5e47fd8afe01035fda6b71512addb
Author: Pieter Hintjens
Date: Sun Sep 29 17:03:44 2013 +0200
Fixed merge conflict error
configure.ac | 1 -
1 file changed, 1 deletion(-)
commit 4d82544c34990423a2195385b6a7d0cdb2c0abc0
Author: Matt Connolly
Date: Sun Sep 29 21:19:50 2013 +1000
config for libsodium in alternate path, using CPP flags for both C and C++ sources.
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit bd6bca7c8209a5503eee1e2dba07c4674058e66a
Author: MinRK
Date: Sat Sep 28 15:42:52 2013 -0700
include missing platform.hpp in curve_keygen
it was excluded, so HAVE_SODIUM would never be defined,
leading to curve_keygen always reporting "recompile with libsodium"
tools/curve_keygen.c | 1 +
1 file changed, 1 insertion(+)
commit 087ddac593570b8efb115d592318bafe7b6748e3
Author: MinRK
Date: Sat Sep 28 15:42:00 2013 -0700
declare z85_encode / decode in zmq_utils
they are used by curve_keygen, but not available
include/zmq_utils.h | 6 ++++++
1 file changed, 6 insertions(+)
commit d1b686b644f834b319378d65935a23a59c997b5c
Author: Matt Connolly
Date: Fri Sep 27 11:20:09 2013 +0000
Disable compiler warning for Solaris
configure.ac | 1 +
1 file changed, 1 insertion(+)
commit 4dc36c0dba23c93703450ad73ecbd0587d772e31
Author: Matt Connolly
Date: Fri Sep 27 11:12:16 2013 +0000
Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup.
configure.ac | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 4 deletions(-)
commit 17d12a6be192210f0c67b50eda024a1b65a81d69
Merge: cd452d5 89b97cb
Author: Pieter Hintjens
Date: Thu Sep 26 05:48:49 2013 -0700
Merge pull request #9 from hintjens/master
Cherry picking changes from libzmq master
commit 89b97cbe5955d3fd34734656f9a589968d90189c
Author: Pieter Hintjens
Date: Thu Sep 26 14:32:47 2013 +0200
Updated CMake project for test_issue_566
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit b0059211d53f9d7919fe461c681cee0f0c9ecdbe
Author: Pieter Hintjens
Date: Thu Sep 26 14:18:40 2013 +0200
Added test case for issue 566
* Tests dealer-to-router connection 100 times
* This was failing in ZMQ v4.0.0 RC1
.gitignore | 1 +
src/stream_engine.cpp | 2 +-
tests/Makefile.am | 4 ++-
tests/test_issue_566.cpp | 85 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 90 insertions(+), 2 deletions(-)
commit cd452d501967d6d753ed132305252970d9608436
Merge: 9cbcc49 dd185e1
Author: Pieter Hintjens
Date: Thu Sep 26 03:32:10 2013 -0700
Merge pull request #8 from hintjens/master
Backporting fixes from master
commit dd185e13bf0e502e38412cc712717ce2bc771302
Author: Pieter Hintjens
Date: Thu Sep 26 12:31:43 2013 +0200
Bumped version for 4.0.1
NEWS | 13 +++++++++++++
include/zmq.h | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
commit 517601de10450635fd9d6cef5f7a8d9ef88a6a56
Author: Pieter Hintjens
Date: Thu Sep 26 11:35:52 2013 +0200
curve_keygen needed assert.h
tools/curve_keygen.c | 1 +
1 file changed, 1 insertion(+)
commit 5e25b32c3679752b40c7a7aa0d25c83150b688d1
Author: Pieter Hintjens
Date: Thu Sep 26 11:33:44 2013 +0200
Build/test errors on OS/X with clang++
src/options.cpp | 2 +-
tests/test_stream.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
commit a5152245bdd39caa747ae7f38374faa945cb51ed
Author: Martin Hurton
Date: Thu Sep 26 09:38:09 2013 +0200
Call flush after writing the identity message
src/stream_engine.cpp | 1 +
1 file changed, 1 insertion(+)
commit 9cbcc49a4acee8d84890f70698b8233debefb1cf
Merge: 2d5bad9 8a931a7
Author: Pieter Hintjens
Date: Tue Sep 24 03:32:02 2013 -0700
Merge pull request #6 from ipechorin/master
stdint.h is not available on all platforms
commit 2d5bad96e3c4b1bc5dd9cd822afca5b4e6f01ce5
Merge: b04df2c c99b727
Author: Pieter Hintjens
Date: Tue Sep 24 03:31:08 2013 -0700
Merge pull request #7 from hintjens/master
Fixed build for MSVC 2008
commit c99b727f6dbbc8fdfa70d1ca2a5ca538601805a1
Author: Pieter Hintjens
Date: Tue Sep 24 12:29:29 2013 +0200
Fixed build for MSVC 2008
include/zmq_utils.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit 8a931a7554931d9a387edaa07fd76b5d41257b1e
Author: Ivan Pechorin
Date: Tue Sep 24 14:00:08 2013 +0400
stdint.h is not available on all platforms
include/zmq.h | 3 +++
include/zmq_utils.h | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
commit b04df2c5309f049202c4f7da78258e3f4fb5432a
Merge: ad1bae2 4df7cb0
Author: Pieter Hintjens
Date: Tue Sep 24 00:12:03 2013 -0700
Merge pull request #4 from hintjens/master
Updated library ABI version
commit 4df7cb043e3649550de7fadbc53635056fb2f4ed
Author: Pieter Hintjens
Date: Tue Sep 24 09:11:17 2013 +0200
Bumped library version and age
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 201454e8660477fd683aa29d9dadc379c60f5c5a
Author: Pieter Hintjens
Date: Fri Sep 20 23:17:01 2013 +0200
Move away from port 8080 which is occupied on some boxes
tests/test_stream.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ad1bae21608710e3f85253f9ad7fb4ecf1431fc8
Merge: 61d8bf9 77f394a
Author: Richard Newton
Date: Fri Sep 20 12:48:29 2013 -0700
Merge pull request #3 from vortechs2000/fix_aix
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
commit 77f394a6813fcf238eb44c9c320116f9921fd1f7
Author: AJ Lewis
Date: Fri Sep 20 14:39:01 2013 -0500
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
This reverts commit 1e8e4d79c885b27831e2196d94987cc2817e0f04.
perf/inproc_lat.cpp | 3 +--
perf/inproc_thr.cpp | 3 +--
tests/testutil.hpp | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
commit 61d8bf9b11e11cfd49302d850dacb5feda33b4aa
Merge: c0c8ce5 1e8e4d7
Author: Pieter Hintjens
Date: Fri Sep 20 09:54:03 2013 -0700
Merge pull request #2 from vortechs2000/fix_aix
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
commit 1e8e4d79c885b27831e2196d94987cc2817e0f04
Author: AJ Lewis
Date: Fri Sep 20 11:43:53 2013 -0500
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
perf/inproc_lat.cpp | 3 ++-
perf/inproc_thr.cpp | 3 ++-
tests/testutil.hpp | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
commit c0c8ce550888272b155400457661e8315546822f
Author: Pieter Hintjens
Date: Fri Sep 20 16:41:08 2013 +0200
File was missing from Makefile.am
src/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 66b1bc6d7f3e04df298270c10f16bf07cc7ef326
Author: Pieter Hintjens
Date: Fri Sep 20 16:15:53 2013 +0200
Added link to security tutorial
NEWS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f5ecc826d963d72affb8cf79c6fd279662fd4b7a
Merge: 8f0a757 a31fe95
Author: Pieter Hintjens
Date: Fri Sep 20 07:06:48 2013 -0700
Merge pull request #1 from hintjens/master
Preparation for 4.0.0 release
commit a31fe9565aa26d73aa4d8bbb0091552056cb5751
Author: Pieter Hintjens
Date: Fri Sep 20 16:03:14 2013 +0200
Source distribution was broken
src/Makefile.am | 1 -
tools/Makefile.am | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
commit 2f4905500d862bb9f0f3871c367d67fb020384b0
Author: Pieter Hintjens
Date: Fri Sep 20 16:02:55 2013 +0200
Version number is 4.0.0
include/zmq.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c10a3ec526a0cc226ad64b74fed6c1b3b04b8daa
Author: Pieter Hintjens
Date: Fri Sep 20 15:53:27 2013 +0200
Updated NEWS for 4.0.0
NEWS | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 109 insertions(+), 2 deletions(-)
commit e0676a2b26c5b215d07061c8b6606b12a9e0c961
Author: Pieter Hintjens
Date: Fri Sep 20 15:30:04 2013 +0200
Renamed new socket options to be clearer
* ZMQ_REQ_STRICT was negative option (default 1) which goes against
the standard, where defaults are zero. I renamed this to
ZMQ_REQ_RELAXED.
* ZMQ_REQ_REQUEST_IDS felt clumsy and describes the technical solution
rather than the problem/requirement. I changed to ZMQ_REQ_CORRELATE
which seems more explicit.
.gitignore | 4 +-
CMakeLists.txt | 4 +-
doc/zmq_getsockopt.txt | 4 +-
doc/zmq_setsockopt.txt | 26 +++---
include/zmq.h | 4 +-
src/req.cpp | 6 +-
tests/Makefile.am | 8 +-
tests/test_req_correlate.cpp | 177 ++++++++++++++++++++++++++++++++++++++++
tests/test_req_relaxed.cpp | 116 ++++++++++++++++++++++++++
tests/test_req_request_ids.cpp | 177 ----------------------------------------
tests/test_req_strict.cpp | 117 --------------------------
11 files changed, 321 insertions(+), 322 deletions(-)
commit b411a3561d2f9f2de29bf42820ca4d408b602107
Author: Pieter Hintjens
Date: Fri Sep 20 14:39:35 2013 +0200
Removed inaccurate note in zmq_poll man page
doc/zmq_poll.txt | 4 ----
1 file changed, 4 deletions(-)
commit 4ce9b4240596f3146a15c97d11f5a3068a805883
Author: Pieter Hintjens
Date: Fri Sep 20 14:28:06 2013 +0200
Built zmq_send_const man page properly
doc/Makefile.am | 2 +-
doc/zmq.txt | 1 +
doc/zmq_send_const.txt | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
commit fef4fa8fc54eb267575e534bff35cd0009485d26
Author: Pieter Hintjens
Date: Fri Sep 20 14:23:43 2013 +0200
Renamed test_connect_delay to test_immediate
* The ZMQ_CONNECT_DELAY option was renamed to ZMQ_IMMEDIATE
.gitignore | 2 +-
CMakeLists.txt | 2 +-
tests/Makefile.am | 4 +-
tests/test_connect_delay.cpp | 229 ------------------------------------------
tests/test_immediate.cpp | 229 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 233 insertions(+), 233 deletions(-)
commit 4298f71cbf94cf391a9b6f6e6bc9971843f06bd6
Author: Pieter Hintjens
Date: Fri Sep 20 13:28:25 2013 +0200
Updated NEWS for 3.2.x releases
NEWS | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
commit 8f0a757f08f66688ccffdc43ca01b9d07464f032
Merge: 90867a4 78cabfe
Author: Pieter Hintjens
Date: Thu Sep 19 06:09:13 2013 -0700
Merge pull request #671 from ricnewton/master
Testing github jenkins integration
commit 78cabfe8eabd252cd7a75a6a2b8af8ef1552dd51
Author: Richard Newton
Date: Thu Sep 19 12:58:58 2013 +0100
More testing github jenkins integration
AUTHORS | 1 -
1 file changed, 1 deletion(-)
commit d503e19381e96d7cf0a07d78b33cdb55c880cac4
Merge: 544575d 90867a4
Author: Richard Newton
Date: Thu Sep 19 12:37:54 2013 +0100
Merge branch 'master' of https://github.com/zeromq/libzmq
commit 544575d18ca4c81827c0becb8fa27c03e78f64bf
Author: Richard Newton
Date: Thu Sep 19 12:28:21 2013 +0100
Revert "More testing github jenkins integratio"
This reverts commit 0640d6d2baa014ad93ba57ad2f692af8f9081eb0.
AUTHORS | 1 +
1 file changed, 1 insertion(+)
commit 0640d6d2baa014ad93ba57ad2f692af8f9081eb0
Author: Richard Newton
Date: Thu Sep 19 12:11:50 2013 +0100
More testing github jenkins integratio
AUTHORS | 1 -
1 file changed, 1 deletion(-)
commit 575ff39bfe6b9c51b159e1e10d7881c017ef7d62
Author: Richard Newton
Date: Thu Sep 19 12:02:17 2013 +0100
Testing github jenkins integration
AUTHORS | 1 +
1 file changed, 1 insertion(+)
commit 90867a4e8f23c9a360c7b276b93521b1a61b7866
Merge: 39de9be 7a747b5
Author: Pieter Hintjens
Date: Thu Sep 19 02:42:31 2013 -0700
Merge pull request #670 from ricnewton/master
Fix cmake build
commit 7a747b5797e4976012cfe1f96f44e224b5f643f0
Author: Richard Newton
Date: Thu Sep 19 09:46:26 2013 +0100
Fix cmake build
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 39de9bebcb53ad08f745c29befe8e13c88c0cf57
Merge: de91c73 e055560
Author: Richard Newton
Date: Thu Sep 19 00:43:49 2013 -0700
Merge pull request #669 from hintjens/master
Renamed inproc connect test (name was too long)
commit e05556075f446c1b5004e6854a157648fe077f8b
Author: Pieter Hintjens
Date: Thu Sep 19 09:36:43 2013 +0200
Renamed inproc connect test (name was too long)
.gitignore | 3 +-
tests/Makefile.am | 4 +-
tests/test_inproc_connect.cpp | 339 +++++++++++++++++++++++++++++
tests/test_inproc_connect_before_bind.cpp | 339 -----------------------------
4 files changed, 342 insertions(+), 343 deletions(-)
commit de91c7362cd6ca64a1a964b126658768c45e2814
Merge: 94c98ab b132305
Author: Richard Newton
Date: Wed Sep 18 04:09:51 2013 -0700
Merge pull request #668 from mrothe/no-public-tests
tests: don't listen on public ports
commit 94c98abba3cfcdbd1127840e7ba5a06d63d467af
Merge: dc79171 825052f
Author: Richard Newton
Date: Wed Sep 18 04:07:35 2013 -0700
Merge pull request #667 from hintjens/master
Reverted pull request 666
commit b13230510ceced26f2dd6ee4707d9403f645da15
Author: Markus Rothe
Date: Wed Sep 18 12:58:19 2013 +0200
tests: don't listen on public ports
tests/test_connect_delay.cpp | 8 ++++----
tests/test_disconnect_inproc.cpp | 2 +-
tests/test_probe_router.cpp | 2 +-
tests/test_req_request_ids.cpp | 2 +-
tests/test_req_strict.cpp | 2 +-
tests/test_security_curve.cpp | 2 +-
tests/test_security_null.cpp | 12 ++++++------
tests/test_security_plain.cpp | 2 +-
tests/test_spec_dealer.cpp | 2 +-
tests/test_spec_pushpull.cpp | 2 +-
tests/test_spec_rep.cpp | 2 +-
tests/test_spec_req.cpp | 2 +-
tests/test_spec_router.cpp | 2 +-
tests/test_stream.cpp | 4 ++--
14 files changed, 23 insertions(+), 23 deletions(-)
commit 825052f83fd32179d0c52478ae4eb9266e2c4a6b
Author: Pieter Hintjens
Date: Tue Sep 17 14:05:55 2013 +0200
Revert "makes curve keys symetric as in libcurve + factorisation"
This reverts commit bfd472f97cad5e37fa384b687a906f515600bac4.
include/zmq.h | 21 +++-----
src/curve_client.cpp | 54 +++++++++----------
src/curve_client.hpp | 30 +++++------
src/curve_server.cpp | 54 +++++++++----------
src/curve_server.hpp | 20 +++----
src/options.cpp | 120 ++++++++++++++++++++++++-----------------
src/options.hpp | 10 ++--
tests/test_security_curve.cpp | 37 ++++++-------
8 files changed, 178 insertions(+), 168 deletions(-)
commit 22eb4d600b237cee894c7f32c6cdc8d5594fb9e3
Author: Pieter Hintjens
Date: Tue Sep 17 14:05:41 2013 +0200
Revert "oblige the application to explicitely set the node type for PLAIN"
This reverts commit 1206f4572b4b3bb405a14cc60605b75d53b819a0.
include/zmq.h | 4 ++--
src/options.cpp | 16 +++++++++-------
tests/test_security_curve.cpp | 4 ++--
tests/test_security_plain.cpp | 9 +++------
4 files changed, 16 insertions(+), 17 deletions(-)
commit 9e66685c0874210cbd74eb4a4c1283f249863973
Author: Pieter Hintjens
Date: Tue Sep 17 13:33:24 2013 +0200
Reformatted text
doc/zmq_setsockopt.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit dc79171fc37597613c827f5ab00aa71fee3d2ac9
Merge: ad0b325 1206f45
Author: Pieter Hintjens
Date: Tue Sep 17 04:32:45 2013 -0700
Merge pull request #666 from lalebarde/master
curve key names as in libcurve, symetry design, a few logic improvements
commit 1206f4572b4b3bb405a14cc60605b75d53b819a0
Author: Laurent Alebarde
Date: Tue Sep 17 12:47:21 2013 +0200
oblige the application to explicitely set the node type for PLAIN
include/zmq.h | 4 ++--
src/options.cpp | 16 +++++++---------
tests/test_security_curve.cpp | 4 ++--
tests/test_security_plain.cpp | 9 ++++++---
4 files changed, 17 insertions(+), 16 deletions(-)
commit bfd472f97cad5e37fa384b687a906f515600bac4
Author: Laurent Alebarde
Date: Tue Sep 17 12:44:14 2013 +0200
makes curve keys symetric as in libcurve + factorisation
include/zmq.h | 21 +++++---
src/curve_client.cpp | 54 +++++++++----------
src/curve_client.hpp | 30 +++++------
src/curve_server.cpp | 54 +++++++++----------
src/curve_server.hpp | 20 +++----
src/options.cpp | 120 +++++++++++++++++------------------------
src/options.hpp | 10 ++--
tests/test_security_curve.cpp | 37 +++++++------
8 files changed, 168 insertions(+), 178 deletions(-)
commit ad0b325e4a0f172438700d933b8bcaee7caf4d73
Merge: 67013f1 7bb2b6a
Author: Martin Hurton
Date: Tue Sep 17 01:53:59 2013 -0700
Merge pull request #665 from hintjens/master
Added test case for NULL domains
commit 7bb2b6ae11cafd241a6007bb2d564d4765ff8cf9
Author: Pieter Hintjens
Date: Tue Sep 17 10:04:57 2013 +0200
Fixed length of domain setting
tests/test_security_null.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7735ca5f8dcc98f71e24ca15c980fd6e2715c036
Author: Pieter Hintjens
Date: Tue Sep 17 09:48:32 2013 +0200
Added test case for NULL domains
tests/test_security_null.cpp | 90 +++++++++++++++++++++++++++++++-----------
1 file changed, 67 insertions(+), 23 deletions(-)
commit 67013f19f6fd37c1abe9cc89102e7bb38628ebea
Merge: 971b275 321a8ff
Author: Ian Barber
Date: Mon Sep 16 06:20:21 2013 -0700
Merge pull request #664 from hintjens/master
NULL mechanism was not dealing with ZAP denials properly
commit 321a8ffea91583535a7cddf7b970cff7f9414b4c
Author: Pieter Hintjens
Date: Mon Sep 16 15:09:55 2013 +0200
NULL mechanism was not dealing with ZAP denials properly
src/null_mechanism.cpp | 4 ++++
1 file changed, 4 insertions(+)
commit 971b275f7acc3573575f5375453dd2a93e2605fd
Merge: 276cd1f fe9815a
Author: Ian Barber
Date: Mon Sep 16 02:04:44 2013 -0700
Merge pull request #663 from hintjens/master
Fixed random failures in test_security_plain and _curve
commit fe9815a7892404deef3989d9ff35a9e78935bc83
Author: Pieter Hintjens
Date: Mon Sep 16 10:56:49 2013 +0200
Fixed random failures in test_security_plain and _curve
* ZAP handler thread was not getting time to start up
* Code now creates and binds handler socket in parent thread and
passes the socket to the zap_handler, so this always gets the
authentication requests.
tests/test_security_curve.cpp | 55 ++++++++++++++++++++---------------------
tests/test_security_null.cpp | 45 +++++++++++++++++----------------
2 files changed, 49 insertions(+), 51 deletions(-)
commit 276cd1f1dae6e1404a143edfe7e1323314224e16
Merge: fbe1b79 6f35100
Author: Pieter Hintjens
Date: Mon Sep 16 01:32:55 2013 -0700
Merge pull request #662 from ricnewton/master
Fix windows build
commit 6f351007d4a710207ad4730923add9635873af11
Author: Richard Newton
Date: Mon Sep 16 09:23:47 2013 +0100
Fix windows build
tests/testutil.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fbe1b79188eb45deaa67a95e9a21a62a52e54b7e
Merge: d76f3f7 dc1f5e9
Author: Pieter Hintjens
Date: Sun Sep 15 15:36:00 2013 -0700
Merge pull request #661 from lalebarde/master
simplify test_security_curve.cpp with zmq_z85_encode
commit dc1f5e9f7c0c2331b0eb5edc487b711f257bc89b
Author: Laurent Alebarde
Date: Mon Sep 16 00:06:24 2013 +0200
simplify test_security_curve.cpp with zmq_z85_encode
tests/test_security_curve.cpp | 35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)
commit d76f3f7c036d02e7ac36d444bec471425cd36d5c
Merge: 5c7b392 576e3ca
Author: Ian Barber
Date: Sun Sep 15 11:37:16 2013 -0700
Merge pull request #660 from hintjens/master
Added z85 codec to ZMQ API
commit 576e3ca5e0f0d67f673e1ef30ec1071d19cb6b3a
Author: Pieter Hintjens
Date: Sun Sep 15 20:07:33 2013 +0200
Added z85 codec to ZMQ API
* Removed redundant Z85 code and include files from project
* Simplified use of headers in test cases (now they all just use testutil.hpp)
* Export zmq_z85_encode() and zmq_z85_decode() in API
* Added man pages for these two functions
doc/Makefile.am | 3 +-
doc/zmq_curve.txt | 2 +
doc/zmq_z85_decode.txt | 50 +++++++++++++
doc/zmq_z85_encode.txt | 56 +++++++++++++++
include/zmq.h | 6 ++
include/zmq_utils.h | 5 ++
src/Makefile.am | 1 -
src/options.cpp | 14 ++--
src/z85_codec.hpp | 109 -----------------------------
src/zmq_utils.cpp | 91 ++++++++++++++++++++++--
tests/test_conflate.cpp | 2 -
tests/test_connect_delay.cpp | 6 --
tests/test_connect_resolve.cpp | 3 -
tests/test_ctx_destroy.cpp | 3 -
tests/test_ctx_options.cpp | 2 -
tests/test_disconnect_inproc.cpp | 2 -
tests/test_fork.cpp | 10 +--
tests/test_hwm.cpp | 3 -
tests/test_inproc_connect_before_bind.cpp | 2 -
tests/test_invalid_rep.cpp | 4 +-
tests/test_iov.cpp | 5 --
tests/test_last_endpoint.cpp | 2 -
tests/test_linger.cpp | 3 -
tests/test_monitor.cpp | 4 --
tests/test_msg_flags.cpp | 2 -
tests/test_pair_inproc.cpp | 1 -
tests/test_pair_ipc.cpp | 1 -
tests/test_pair_tcp.cpp | 1 -
tests/test_probe_router.cpp | 3 -
tests/test_req_request_ids.cpp | 2 -
tests/test_req_strict.cpp | 3 -
tests/test_reqrep_device.cpp | 3 -
tests/test_reqrep_inproc.cpp | 1 -
tests/test_reqrep_ipc.cpp | 1 -
tests/test_reqrep_tcp.cpp | 1 -
tests/test_router_mandatory.cpp | 3 -
tests/test_security_curve.cpp | 4 --
tests/test_security_null.cpp | 3 -
tests/test_security_plain.cpp | 3 -
tests/test_shutdown_stress.cpp | 4 --
tests/test_spec_dealer.cpp | 2 -
tests/test_spec_pushpull.cpp | 2 -
tests/test_spec_rep.cpp | 2 -
tests/test_spec_req.cpp | 3 -
tests/test_spec_router.cpp | 2 -
tests/test_stream.cpp | 2 -
tests/test_sub_forward.cpp | 4 --
tests/test_system.cpp | 15 ++--
tests/test_term_endpoint.cpp | 4 --
tests/test_timeo.cpp | 5 --
tests/testutil.hpp | 14 +++-
tools/curve_keygen.c | 46 +-----------
tools/z85_codec.h | 109 -----------------------------
53 files changed, 237 insertions(+), 397 deletions(-)
commit 5c7b39275f322799d1baa9be79340943071fa950
Merge: 9066851 193d0bb
Author: Ian Barber
Date: Sun Sep 15 09:51:09 2013 -0700
Merge pull request #659 from hintjens/master
Fixed Z85 methods to be static
commit 193d0bb63400d1a0f9a4c970e08c4807358244eb
Author: Pieter Hintjens
Date: Sun Sep 15 17:30:18 2013 +0200
Fixed Z85 methods to be static and not pollute library
src/z85_codec.hpp | 4 ++--
tests/test_security_curve.cpp | 41 +++++++++++++++++++++++++++++++++++++++--
tools/curve_keygen.c | 39 +++++++++++++++++++++++++++++++++++++--
tools/z85_codec.h | 4 ++--
4 files changed, 80 insertions(+), 8 deletions(-)
commit 65ef76bb59255c2614055910748359276656c996
Author: Pieter Hintjens
Date: Sun Sep 15 15:45:37 2013 +0200
Minor simplification to makefile
tools/Makefile.am | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit 90668517da4d29383470a794c51bb1647b2cc8ab
Merge: 133c32d 4e6c56e
Author: Pieter Hintjens
Date: Sun Sep 15 06:19:00 2013 -0700
Merge pull request #658 from ricnewton/inproc_connect_before_bind
Support high water mark on inproc socket connect before bind.
commit 4e6c56e081a00f9963af337f5d49c73e2ac8afc3
Merge: b929882 133c32d
Author: Richard Newton
Date: Sun Sep 15 13:36:07 2013 +0100
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
commit b9298823b4b42dd5beeedfcf8e06cb5f57ecd3bb
Author: Richard Newton
Date: Sun Sep 15 13:35:44 2013 +0100
Set hwm on connect socket before bind has happend to just that of connects hwm.
src/pipe.cpp | 4 +-
src/socket_base.cpp | 8 ++-
tests/test_hwm.cpp | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 163 insertions(+), 5 deletions(-)
commit 7841b0dd0f94e050bce753c394cd034ab3184ee9
Author: Richard Newton
Date: Sat Sep 14 17:27:18 2013 +0100
Support high water mark on inproc socket connect before bind.
src/ctx.cpp | 97 ++++++++++++++++++++++---------------
src/ctx.hpp | 2 +
src/object.hpp | 3 +-
src/pipe.cpp | 5 ++
src/pipe.hpp | 3 ++
tests/test_hwm.cpp | 134 +++++++++++++++++++++++++++++++++++++++-------------
6 files changed, 171 insertions(+), 73 deletions(-)
commit 133c32d5ed523c8bd7976f1fd43663083d9456ff
Merge: 3298e5a 0db2bbe
Author: Richard Newton
Date: Fri Sep 13 00:52:12 2013 -0700
Merge pull request #657 from hintjens/master
Build didn't work if libsodium wasn't installed
commit 0db2bbe29d4b4096ecb863c1702cb29d3eadbd29
Author: Pieter Hintjens
Date: Fri Sep 13 09:47:23 2013 +0200
Build didn't work if libsodium wasn't installed
tools/curve_keygen.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit 3298e5a206ccab9c441c69a165332a97cbf6ccb9
Merge: c1fabf5 b9c0906
Author: Pieter Hintjens
Date: Thu Sep 12 13:46:37 2013 -0700
Merge pull request #656 from ricnewton/inproc_connect_before_bind
Allow inproc sockets to connect before bind
commit b9c09064d5760e015b33c716aace846eb3802c43
Author: Richard Newton
Date: Thu Sep 12 21:22:47 2013 +0100
Fix whitespace
src/socket_base.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit d5bd68b60b0311699b0fad411db0f1a09f3ee030
Merge: 379bcb0 c1fabf5
Author: Richard Newton
Date: Thu Sep 12 21:09:30 2013 +0100
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
commit 379bcb088153cf4207e46b82bebd50f9fcf7e359
Author: Richard Newton
Date: Thu Sep 12 21:07:29 2013 +0100
Send identities when connecting pending sockets.
src/ctx.cpp | 39 ++++++++++++----
src/ctx.hpp | 7 +--
src/object.cpp | 2 +-
src/object.hpp | 2 +-
src/socket_base.cpp | 3 +-
tests/test_inproc_connect_before_bind.cpp | 71 +++++++++++++++++++++++++----
6 files changed, 102 insertions(+), 22 deletions(-)
commit c1fabf5ca9e7e9c575ab7a6e8a648a9f0e0ebf2a
Merge: 60f4704 345bf14
Author: Ian Barber
Date: Thu Sep 12 10:27:57 2013 -0700
Merge pull request #655 from hintjens/master
Fixed overwrite in zmq_getsockopt
commit 7c3496a76acfad992ebd7f1af1c2b22174b79530
Author: Richard Newton
Date: Thu Sep 12 18:09:37 2013 +0100
Fix race condition and support multiple socket connects before bind.
.gitignore | 1 +
src/command.hpp | 1 +
src/ctx.cpp | 43 +++++--
src/ctx.hpp | 4 +-
src/object.cpp | 16 ++-
src/object.hpp | 3 +-
src/socket_base.cpp | 46 +-------
tests/Makefile.am | 4 +-
tests/test_inproc_connect_before_bind.cpp | 180 ++++++++++++++++++++++++++++-
9 files changed, 232 insertions(+), 66 deletions(-)
commit 60f470450d5d541eed604b437252b0c300f1f6ee
Merge: 168efb9 6c84a54
Author: Pieter Hintjens
Date: Thu Sep 12 09:53:26 2013 -0700
Merge pull request #654 from lalebarde/master
add exhaustive comparison in testutil bounce
commit 6c84a543882c8ac4e673c5de40df11a27ab76c75
Author: Laurent Alebarde
Date: Thu Sep 12 18:17:31 2013 +0200
add exhaustive comparison in testutil bounce
tests/testutil.hpp | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit 345bf146f151cbc62fd8b000dbe1316463d2a82d
Author: Pieter Hintjens
Date: Thu Sep 12 18:03:23 2013 +0200
Fixed overwrite in zmq_getsockopt
On ZMQ_CURVE_xxxKEY fetches, would return 41 bytes into caller's 40-byte
buffer. Now these fetches only return 41 bytes if the caller explicitly
provides a 41-byte buffer (i.e. the option size is 41).
doc/zmq_getsockopt.txt | 12 +++++++-----
src/options.cpp | 6 +++---
src/options.hpp | 2 +-
src/z85_codec.hpp | 3 ++-
tools/z85_codec.h | 3 ++-
5 files changed, 15 insertions(+), 11 deletions(-)
commit 6fefa4166acae14edf69473bb739a34d46128a70
Merge: 5f20d63 168efb9
Author: Richard Newton
Date: Thu Sep 12 15:13:25 2013 +0100
Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind
commit 5f20d63665c0ddbd3ff8824a9d1eda33bea07735
Author: Richard Newton
Date: Thu Sep 12 14:44:44 2013 +0100
First attempt at inproc connect before bind
CMakeLists.txt | 3 +-
src/ctx.cpp | 28 +++++++
src/ctx.hpp | 13 +++
src/object.cpp | 15 ++++
src/object.hpp | 5 ++
src/socket_base.cpp | 127 ++++++++++++++++++++---------
tests/test_ctx_destroy.cpp | 3 +
tests/test_inproc_connect_before_bind.cpp | 114 ++++++++++++++++++++++++++
tests/test_pair_inproc.cpp | 2 +-
9 files changed, 270 insertions(+), 40 deletions(-)
commit 168efb9739eb3064bbbffc7c5849e4682e47547b
Merge: 0d14efe 0f9e5f6
Author: Martin Hurton
Date: Thu Sep 12 05:21:25 2013 -0700
Merge pull request #653 from mattconnolly/master
Fix preprocessor typoe
commit 6ff65a8aa4c97ddf442c4d72a74a95a81be5057f
Author: Pieter Hintjens
Date: Thu Sep 12 13:16:22 2013 +0200
Builds and installs curve_keygen tool
tools/Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 0d14efe73a9c39b263240614ad4a40ac5020e55e
Merge: 0f7141c ac8c72c
Author: Richard Newton
Date: Thu Sep 12 03:56:27 2013 -0700
Merge pull request #652 from hintjens/master
Minor fixes to project packaging
commit ac8c72cea68235faffe71b248bf45ae57fe5619f
Author: Pieter Hintjens
Date: Thu Sep 12 12:47:14 2013 +0200
Added test_ctx_destroy to .gitignore
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit d1ba8a50d2fad55dbb000065326e2e9138bfd1d0
Author: Pieter Hintjens
Date: Thu Sep 12 12:46:43 2013 +0200
Extended TravisCI build to use libsodium
.travis.yml | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
commit 52370bff4485d6aa3e84ccf49f4f6020b50b76af
Author: Pieter Hintjens
Date: Thu Sep 12 12:46:23 2013 +0200
Removed debugging printfs
tests/test_security_curve.cpp | 2 --
tests/test_security_null.cpp | 2 --
tests/test_security_plain.cpp | 2 --
3 files changed, 6 deletions(-)
commit 0f9e5f60498cdd2146c24a8133356d59d963d806
Author: Matt Connolly
Date: Thu Sep 12 20:30:16 2013 +1000
Fix preprocessor typoe
tests/test_system.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0f7141c21a2eb5adc6cb14530b7cce7d048ccbd6
Merge: bba0dd1 8e6b5ad
Author: Pieter Hintjens
Date: Wed Sep 11 09:33:08 2013 -0700
Merge pull request #651 from ricnewton/master
Fix Makefile.am for test_ctx_destroy
commit 8e6b5ad17ef963d2ecafa3b25659a226fa1d212c
Author: Richard Newton
Date: Wed Sep 11 15:02:16 2013 +0100
Fix Makefile.am for test_ctx_destroy
tests/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit bba0dd19a1886ed818c537abd8ca7896bafc2f68
Merge: 25c89ca ccf0e61
Author: Pieter Hintjens
Date: Tue Sep 10 07:03:40 2013 -0700
Merge pull request #650 from ricnewton/master
Implement non-blocking shutdown command
commit ccf0e61b770bde35b6ce7d46ca026c15a2101b1c
Merge: 64e1c18 25c89ca
Author: Richard Newton
Date: Tue Sep 10 13:30:11 2013 +0100
Merge remote-tracking branch 'upstream/master'
commit 64e1c181f71299614975b2809e112803719221b1
Author: Richard Newton
Date: Tue Sep 10 13:30:00 2013 +0100
Implement non-blocking shutdown command that unblocks other threads waiting on blocking operations.
CMakeLists.txt | 1 +
doc/zmq_ctx_shutdown.txt | 52 +++++++++++++++++++++++++
include/zmq.h | 1 +
src/ctx.cpp | 19 ++++++++++
src/ctx.hpp | 9 +++++
src/zmq.cpp | 10 +++++
tests/Makefile.am | 1 +
tests/test_ctx_destroy.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 183 insertions(+)
commit 25c89cace164c50434ec0300aa2fd50337064561
Merge: 4edad54 6725c46
Author: Martin Hurton
Date: Mon Sep 9 12:12:36 2013 -0700
Merge pull request #649 from hintjens/master
Fixed minor error in NULL mechanism (spec was wrong)
commit 6725c4644f111ba3f3ab3b0aba5a53cea0265391
Author: Pieter Hintjens
Date: Mon Sep 9 20:40:34 2013 +0200
Added ZMQ_ZAP_DOMAIN socket option
* This is passed to the ZAP handler in the 'domain' field
* If not set, or empty, then NULL security does not call the ZAP handler
* This resolves the phantom ZAP request syndrome seen with sockets where
security was never intended (e.g. in test cases)
* This means if you install a ZAP handler, it will not get any requests
for new connections until you take some explicit action, which can be
setting a username/password for PLAIN, a key for CURVE, or the domain
for NULL.
doc/zmq_getsockopt.txt | 50 +++++++++++++++++----------
doc/zmq_setsockopt.txt | 76 +++++++++++++++++++++++++----------------
include/zmq.h | 5 +--
src/curve_server.cpp | 7 ++--
src/null_mechanism.cpp | 9 +++--
src/options.cpp | 53 +++++++++++++++++-----------
src/options.hpp | 11 +++---
src/plain_mechanism.cpp | 7 ++--
tests/test_security_curve.cpp | 22 ++++++------
tests/test_security_null.cpp | 27 ++++++++-------
tests/test_security_plain.cpp | 16 +++++----
11 files changed, 171 insertions(+), 112 deletions(-)
commit c45d91a10611b8a9812691f404fd3e30f002585a
Author: Pieter Hintjens
Date: Mon Sep 9 19:58:31 2013 +0200
Fixed comments on curve_keygen tool
tools/curve_keygen.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
commit 635a03d2404129d0d5cee0ad517591befeba4f14
Author: Pieter Hintjens
Date: Mon Sep 9 19:58:18 2013 +0200
Was sending NULL mechanism name with extra null (fixed)
src/null_mechanism.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 4edad545372774c5d8aaae87d45490f27d171884
Merge: 498dc37 a601b3f
Author: Pieter Hintjens
Date: Fri Sep 6 03:19:45 2013 -0700
Merge pull request #648 from ricnewton/master
Fix tests on windows
commit a601b3f6f40e8d5a2926dbf61c00d9b416e33560
Author: Richard Newton
Date: Fri Sep 6 10:25:00 2013 +0100
Remove windows debug code.
tests/test_system.cpp | 1 -
1 file changed, 1 deletion(-)
commit 7485b09cba0d335de271949f41bb6a5b77ee08c4
Author: Richard Newton
Date: Fri Sep 6 10:08:11 2013 +0100
Fix tests on windows
tests/test_security_curve.cpp | 2 +-
tests/test_system.cpp | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
commit 498dc3798878c611392b27064efa1e2161d1d9bf
Merge: 1f03710 4c75306
Author: Martin Hurton
Date: Fri Sep 6 00:54:51 2013 -0700
Merge pull request #645 from hintjens/master
Updated libzmq to match RFCs
commit 4c753060236caf12102194b313abfb28dccaa7ff
Author: Pieter Hintjens
Date: Fri Sep 6 09:22:09 2013 +0200
Fixed test_stream case
- was not looping to read all input from peer
- broke on OS/X specifically
tests/test_stream.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 9dd324aab23d8540260c8da93ae3927854542ecb
Author: Pieter Hintjens
Date: Thu Sep 5 15:18:42 2013 +0200
z85 encoding buffer overrun
tests/test_security_curve.cpp | 2 +-
tools/curve_keygen.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 1f037109806081468f250dda4f2762cec8e1f452
Merge: 7b02f1c 11deee4
Author: Pieter Hintjens
Date: Wed Sep 4 12:12:28 2013 -0700
Merge pull request #647 from sebastien/master
Clarified zmq_socket.txt ZMQ_STREAM section, added HTTP server example
commit 11deee4e3eafb0f97aae95b786e39007e335ca41
Merge: f918884 7b02f1c
Author: Sebastien Pierre
Date: Wed Sep 4 15:02:50 2013 -0400
Merge branch 'master' of github.com:sebastien/libzmq
commit f9188841b02b90fbba493c803f17be082d47f4d1
Author: Sebastien Pierre
Date: Wed Sep 4 14:58:07 2013 -0400
Clarified zmq_socket.txt ZMQ_STREAM section, added example
doc/zmq_socket.txt | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
commit 0a9261472f6c28e4092b0564da3960146bdfd743
Author: Pieter Hintjens
Date: Wed Sep 4 19:41:33 2013 +0200
Removed test_raw_socket
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 32fa426e61b92bdd0929990cebc799839cc335a7
Author: Pieter Hintjens
Date: Wed Sep 4 19:38:15 2013 +0200
Added system check at start of selftests
- tests that system can provide at least 1,000 sockets
- we could expand on this but this covers the main case of OS/X
having a too-low default limit of 256 handles per process
.gitignore | 1 +
tests/Makefile.am | 4 +++-
tests/test_system.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
commit 7b02f1c966cc7b615b6cfd5df81f09478be2dcb0
Merge: ef207e4 bb34885
Author: Pieter Hintjens
Date: Wed Sep 4 09:42:39 2013 -0700
Merge pull request #646 from minrk/xfail-linger
mark test_linger as expected failure
commit bb348858f14e797ef125f8ba95a3218ddbc3180a
Author: MinRK
Date: Wed Sep 4 09:38:54 2013 -0700
mark test_linger as expected failure
rather than pretending it passes
tests/Makefile.am | 3 ++-
tests/test_linger.cpp | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
commit 6612280946a40ae3d0d48ff729a1a81c23046ca8
Author: Pieter Hintjens
Date: Wed Sep 4 18:10:47 2013 +0200
Removed temporary patch on tests/Makefile.am
tests/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 28b0a5fa2711b43e2378b7c16367ce14604df096
Author: Pieter Hintjens
Date: Wed Sep 4 17:59:45 2013 +0200
Updated libzmq to match RFC 23, 24, 25, 26
* Command names changed from null terminated to length-specified
* Command frames use the correct flag (bit 2)
* test_stream acts as test case for command frames
* Some code cleanups
src/curve_client.cpp | 24 +++++++--------
src/curve_client.hpp | 8 ++---
src/curve_server.cpp | 24 +++++++--------
src/curve_server.hpp | 8 ++---
src/mechanism.hpp | 8 ++---
src/msg.hpp | 3 +-
src/null_mechanism.cpp | 8 ++---
src/null_mechanism.hpp | 4 +--
src/plain_mechanism.cpp | 66 +++++++++++++++++++++--------------------
src/plain_mechanism.hpp | 20 ++++++-------
src/stream_engine.cpp | 20 ++++++-------
src/stream_engine.hpp | 8 ++---
src/v2_decoder.cpp | 2 ++
src/v2_encoder.cpp | 2 ++
src/v2_protocol.hpp | 3 +-
tests/Makefile.am | 3 +-
tests/test_security_curve.cpp | 2 +-
tests/test_stream.cpp | 8 ++---
18 files changed, 114 insertions(+), 107 deletions(-)
commit 1844a27c82fbd72a83ffd28b59c2e5ab1f2ddab7
Author: Pieter Hintjens
Date: Wed Sep 4 15:00:05 2013 +0200
Removed test_raw_sock test case (replaced by test_stream)
tests/Makefile.am | 6 +-
tests/test_raw_sock.cpp | 166 -----------------------------------------------
2 files changed, 1 insertion(+), 171 deletions(-)
commit ef207e45ce88d5aab6c92b0f8f4322881fb73b44
Merge: 7561ff7 873d80c
Author: Pieter Hintjens
Date: Wed Sep 4 04:19:34 2013 -0700
Merge pull request #644 from ipechorin/master
Fix MSVC 2008 and 2010 project files
commit 873d80c9fecc823d903b7e458b959f9877598d8c
Author: Ivan Pechorin
Date: Wed Sep 4 15:13:14 2013 +0400
fix MSVC 2008 project: include the source files added recently
builds/msvc/libzmq/libzmq.vcproj | 62 ++++++++++++++++++++++++++++++++------
1 file changed, 53 insertions(+), 9 deletions(-)
commit e071d3a4ae1421941127d360e31284eac5451047
Author: Ivan Pechorin
Date: Wed Sep 4 15:00:59 2013 +0400
fix MSVC10 project: include the source files added recently
builds/msvc/libzmq/libzmq.vcxproj | 10 +++++++++-
builds/msvc/libzmq/libzmq.vcxproj.filters | 24 ++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
commit 7561ff70f36b23f40366c1ac721f1b4fbd16c4fa
Merge: 0ff896d 4696f00
Author: Pieter Hintjens