From 16f8ea3e95f3e7897ed9d1a7536e7acccaaf54f0 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Sun, 17 Mar 2013 11:30:49 +0100 Subject: [PATCH 1/2] Clarified HWM=0 means infinite --- doc/zmq_getsockopt.txt | 6 ++++-- doc/zmq_setsockopt.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index fb26db12..fb28053b 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -60,7 +60,8 @@ ZMQ_SNDHWM: Retrieves high water mark for outbound messages The 'ZMQ_SNDHWM' option shall return the high water mark for outbound messages on the specified 'socket'. The high water mark is a hard limit on the maximum number of outstanding messages 0MQ shall queue in memory for any single peer -that the specified 'socket' is communicating with. +that the specified 'socket' is communicating with. A value of zero means no +limit. If this limit has been reached the socket shall enter an exceptional state and depending on the socket type, 0MQ shall take appropriate action such as @@ -80,7 +81,8 @@ ZMQ_RCVHWM: Retrieve high water mark for inbound messages The 'ZMQ_RCVHWM' option shall return the high water mark for inbound messages on the specified 'socket'. The high water mark is a hard limit on the maximum number of outstanding messages 0MQ shall queue in memory for any single peer -that the specified 'socket' is communicating with. +that the specified 'socket' is communicating with. A value of zero means no +limit. If this limit has been reached the socket shall enter an exceptional state and depending on the socket type, 0MQ shall take appropriate action such as diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index cced3a24..52253318 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -31,7 +31,8 @@ ZMQ_SNDHWM: Set high water mark for outbound messages The 'ZMQ_SNDHWM' option shall set the high water mark for outbound messages on the specified 'socket'. The high water mark is a hard limit on the maximum number of outstanding messages 0MQ shall queue in memory for any single peer -that the specified 'socket' is communicating with. +that the specified 'socket' is communicating with. A value of zero means no +limit. If this limit has been reached the socket shall enter an exceptional state and depending on the socket type, 0MQ shall take appropriate action such as @@ -55,7 +56,8 @@ ZMQ_RCVHWM: Set high water mark for inbound messages The 'ZMQ_RCVHWM' option shall set the high water mark for inbound messages on the specified 'socket'. The high water mark is a hard limit on the maximum number of outstanding messages 0MQ shall queue in memory for any single peer -that the specified 'socket' is communicating with. +that the specified 'socket' is communicating with. A value of zero means no +limit. If this limit has been reached the socket shall enter an exceptional state and depending on the socket type, 0MQ shall take appropriate action such as From 8c96deb900cde8759ade482ef6c660d7fc35a03c Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Wed, 20 Mar 2013 11:59:23 +0100 Subject: [PATCH 2/2] Added corporate copyrights --- AUTHORS | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 55d55614..c994fc6a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,14 @@ -Contributors -============ +Corporate Contributors +====================== + +Copyright (c) 2007-2013 iMatix Corporation +Copyright (c) 2009-2011 250bpm s.r.o. +Copyright (c) 2010-2011 Miru Limited +Copyright (c) 2011 VMware, Inc. +Copyright (c) 2012 Spotify AB + +Individual Contributors +======================= AJ Lewis Alexej Lotz