Merge pull request #46 from pieterh/master

Preparing for release 2.2.0
zeromq · Apr 4, 2012 · 2bdb487 · 2bdb487
2 parents bfd04c5 + 0b2f5cb
commit 2bdb487
Show file tree

Hide file tree

Showing 32 changed files with 106 additions and 142 deletions.
diff --git a/NEWS b/NEWS
@@ -1,11 +1,14 @@
-0MQ version 2.1.12 (Stable), released on 2012/xx/xx
-===================================================
+0MQ version 2.2.0 (Stable), released on 2012/04/04
+==================================================
+
+Changes
+-------
+
+* Fixed issue 349, add send/recv timeout socket options.
 
 Bug fixes
 ---------
 
-* Fixed issue 349, add send/recv socket options
-
 * Fixed issue 301, fix builds on HP-UX 11iv3 when using either gcc or aCC.
 
 * Fixed issue 305, memory leakage when using dynamic subscriptions. 

diff --git a/configure.in b/configure.in
@@ -27,9 +27,10 @@ AC_SUBST(PACKAGE_VERSION)
 #
 # ZeroMQ versions prior to 2.1.0 use 0.0.0 ("unstable")
 # ZeroMQ version 2.1.0: 1:0:0
+# ZeroMQ version 2.2.0: 1:1:0
 #
 # libzmq -version-info current:revision:age
-LTVER="1:0:0"
+LTVER="1:1:0"
 AC_SUBST(LTVER)
 
 # Take a copy of original flags

diff --git a/doc/zmq.txt b/doc/zmq.txt
@@ -200,8 +200,7 @@ of the 0MQ community and pointers can be found on the 0MQ website.
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
 
 
 RESOURCES

diff --git a/doc/zmq_bind.txt b/doc/zmq_bind.txt
@@ -89,5 +89,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_close.txt b/doc/zmq_close.txt
@@ -48,5 +48,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_connect.txt b/doc/zmq_connect.txt
@@ -87,5 +87,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_cpp.txt b/doc/zmq_cpp.txt
@@ -208,5 +208,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_device.txt b/doc/zmq_device.txt
@@ -121,18 +121,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Pieter Hintjens <[email protected]>
-
-
-RESOURCES
----------
-Main web site: <http://www.zeromq.org/>
-
-Report bugs to the 0MQ development mailing list: <[email protected]>
-
-
-COPYING
--------
-Free use of this software is granted under the terms of the GNU Lesser General
-Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER`
-included with the 0MQ distribution.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_errno.txt b/doc/zmq_errno.txt
@@ -46,5 +46,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt
@@ -79,6 +79,38 @@ Default value:: 0
 Applicable socket types:: all
 
 
+ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Retrieve the timeout for recv operation on the socket.  If the value is `0`,
+_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
+message to receive. If the value is `-1`, it will block until a message is
+available. For all other values, it will wait for a message for that amount
+of time before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Retrieve the timeout for send operation on the socket. If the value is `0`,
+_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
+cannot be sent. If the value is `-1`, it will block until the message is sent.
+For all other values, it will try to send the message for that amount of time
+before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
 ZMQ_SWAP: Retrieve disk offload size
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_SWAP' option shall retrieve the disk offload (swap) size for the
@@ -394,38 +426,6 @@ assert (rc == 0);
 ----
 
 
-ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieve the timeout for recv operation on the socket.  If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieve the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
 SEE ALSO
 --------
 linkzmq:zmq_setsockopt[3]
@@ -435,5 +435,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_init.txt b/doc/zmq_init.txt
@@ -47,5 +47,4 @@ linkzmq:zmq_term[3]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_inproc.txt b/doc/zmq_inproc.txt
@@ -85,5 +85,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_ipc.txt b/doc/zmq_ipc.txt
@@ -76,5 +76,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_close.txt b/doc/zmq_msg_close.txt
@@ -51,5 +51,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_copy.txt b/doc/zmq_msg_copy.txt
@@ -53,5 +53,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_data.txt b/doc/zmq_msg_data.txt
@@ -44,5 +44,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_init.txt b/doc/zmq_msg_init.txt
@@ -61,5 +61,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_init_data.txt b/doc/zmq_msg_init_data.txt
@@ -79,5 +79,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_init_size.txt b/doc/zmq_msg_init_size.txt
@@ -54,5 +54,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_move.txt b/doc/zmq_msg_move.txt
@@ -48,5 +48,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_msg_size.txt b/doc/zmq_msg_size.txt
@@ -44,5 +44,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_pgm.txt b/doc/zmq_pgm.txt
@@ -156,7 +156,7 @@ linkzmq:zmq_ipc[7]
 linkzmq:zmq_inproc[7]
 linkzmq:zmq[7]
 
+
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt
@@ -128,5 +128,4 @@ Your operating system documentation for the _poll()_ system call.
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_recv.txt b/doc/zmq_recv.txt
@@ -117,5 +117,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_send.txt b/doc/zmq_send.txt
@@ -116,5 +116,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
@@ -143,6 +143,38 @@ Default value:: N/A
 Applicable socket types:: ZMQ_SUB
 
 
+ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets the timeout for receive operation on the socket. If the value is `0`,
+_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
+message to receive. If the value is `-1`, it will block until a message is
+available. For all other values, it will wait for a message for that amount
+of time before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets the timeout for send operation on the socket. If the value is `0`,
+_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
+cannot be sent. If the value is `-1`, it will block until the message is sent.
+For all other values, it will try to send the message for that amount of time
+before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
 ZMQ_RATE: Set multicast data rate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
@@ -369,38 +401,6 @@ assert (rc);
 ----
 
 
-ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the timeout for receive operation on the socket. If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
 SEE ALSO
 --------
 linkzmq:zmq_getsockopt[3]
@@ -410,5 +410,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_socket.txt b/doc/zmq_socket.txt
@@ -338,5 +338,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_strerror.txt b/doc/zmq_strerror.txt
@@ -51,5 +51,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.
diff --git a/doc/zmq_tcp.txt b/doc/zmq_tcp.txt
@@ -158,5 +158,4 @@ linkzmq:zmq[7]
 
 AUTHORS
 -------
-This 0MQ manual page was written by Martin Sustrik <[email protected]> and
-Martin Lucina <[email protected]>.
+This manual page was written by the 0MQ community.