Merge tag 'upstream/2.2.0'

Upstream version 2.2.0

116 files changed, 4993 insertions, 2629 deletions

diff --git a/ChangeLog b/ChangeLog
index 9161480..98c598f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,437 @@
 # Generated by Makefile. Do not edit.
 
+commit 8daada4bdc41bfe9da9e3c93c8b0f6c04a6cb0ec
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Apr 10 20:30:31 2012 +0200
+
+    gcc_421_char_traits.hpp was missing from tarballs
+
+ src/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit fb64b8801cd02776e1524aedc41083f9bf876e4d
+Merge: 2bdb487 f2a8fa1
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 04:36:54 2012 -0700
+
+    Merge pull request #47 from pieterh/master
+    
+    Bumped version for next release (2.2.1)
+
+commit f2a8fa1de6d92c5264ff19e3ed05af115069edc0
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 12:26:45 2012 +0100
+
+    Bumped version number to 2.2.1 for next release
+
+ include/zmq.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2bdb487abbe69984ec264ddcb785e032e1b0419f
+Merge: bfd04c5 0b2f5cb
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 04:11:29 2012 -0700
+
+    Merge pull request #46 from pieterh/master
+    
+    Preparing for release 2.2.0
+
+commit 0b2f5cbac93b674e6282cc85222b64cf6a17950a
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 12:06:28 2012 +0100
+
+    Fixed man pages for release 2.2.0
+    
+    * Fixed new entries for getsockopt/setsockopt SNDTIMEO and RCVTIMEO
+    * Removed individual authorship from man page footers
+
+ doc/zmq.txt               |    3 +-
+ doc/zmq_bind.txt          |    3 +-
+ doc/zmq_close.txt         |    3 +-
+ doc/zmq_connect.txt       |    3 +-
+ doc/zmq_cpp.txt           |    3 +-
+ doc/zmq_device.txt        |   16 +----------
+ doc/zmq_errno.txt         |    3 +-
+ doc/zmq_getsockopt.txt    |   67 ++++++++++++++++++++++-----------------------
+ doc/zmq_init.txt          |    3 +-
+ doc/zmq_inproc.txt        |    3 +-
+ doc/zmq_ipc.txt           |    3 +-
+ doc/zmq_msg_close.txt     |    3 +-
+ doc/zmq_msg_copy.txt      |    3 +-
+ doc/zmq_msg_data.txt      |    3 +-
+ doc/zmq_msg_init.txt      |    3 +-
+ doc/zmq_msg_init_data.txt |    3 +-
+ doc/zmq_msg_init_size.txt |    3 +-
+ doc/zmq_msg_move.txt      |    3 +-
+ doc/zmq_msg_size.txt      |    3 +-
+ doc/zmq_pgm.txt           |    4 +-
+ doc/zmq_poll.txt          |    3 +-
+ doc/zmq_recv.txt          |    3 +-
+ doc/zmq_send.txt          |    3 +-
+ doc/zmq_setsockopt.txt    |   67 ++++++++++++++++++++++-----------------------
+ doc/zmq_socket.txt        |    3 +-
+ doc/zmq_strerror.txt      |    3 +-
+ doc/zmq_tcp.txt           |    3 +-
+ doc/zmq_term.txt          |    3 +-
+ doc/zmq_version.txt       |    4 +-
+ 29 files changed, 95 insertions(+), 135 deletions(-)
+
+commit 87cce25bd9b31a192297bc4213f45107f5a1b796
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 11:53:58 2012 +0100
+
+    Updated product version to 2.2.0
+
+ include/zmq.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 33af4869733de3f646daf2bafc242f813fb927f4
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 11:53:02 2012 +0100
+
+    Updated ABI version to 1.1.0
+
+ configure.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit b0d95774000b930125f24450f9e080b9e8b63a0c
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Apr 4 11:50:50 2012 +0100
+
+    Updated NEWS for version 2.2.0
+
+ NEWS |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit bfd04c5b867890b4d6a563f2a7d95b5d183e84ba
+Merge: 6ab8ef0 1e5c6fa
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Apr 3 05:27:13 2012 -0700
+
+    Merge pull request #45 from jhawk28/master
+    
+    Fix issue 349
+
+commit 1e5c6fa0077dcd5767bc557fbccaf383dee98339
+Author: Joshua Foster <jhawk28@gmail.com>
+Date:   Sun Apr 1 20:44:26 2012 -0400
+
+    Fix issue 349
+    
+    https://zeromq.jira.com/browse/LIBZMQ-349
+    Add the send/recv socket options from 3.1.0.
+
+ .gitignore             |    1 +
+ NEWS                   |    2 +
+ doc/zmq_getsockopt.txt |   32 ++++++++++++
+ doc/zmq_setsockopt.txt |   32 ++++++++++++
+ include/zmq.h          |    4 +-
+ src/options.cpp        |   39 +++++++++++++++-
+ src/options.hpp        |    4 ++
+ src/socket_base.cpp    |    8 ++--
+ tests/Makefile.am      |    4 +-
+ tests/test_timeo.cpp   |  125 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 10 files changed, 244 insertions(+), 7 deletions(-)
+
+commit 6ab8ef084242299a9b8ada00b500126e465f6618
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 20 14:48:45 2012 -0500
+
+    Updated NEWS for issue 342
+
+ NEWS |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6f3967176b1d3b6f0f586cc92848f9f6e80ee912
+Merge: 24f1175 4b8ace2
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 20 12:47:19 2012 -0700
+
+    Merge pull request #42 from yisding/master
+    
+    missing algorithm include
+
+commit 24f1175d942323697bff6ed1690ffbdcf2f33631
+Merge: 25c7cd0 48f70a8
+Author: Chuck Remes <cremes@mac.com>
+Date:   Tue Mar 20 09:40:20 2012 -0700
+
+    Merge pull request #44 from pieterh/master
+    
+    Fixed issue LIBZMQ-293 - libzmq doesn't follow ZMTP/1.0 spec
+
+commit 48f70a88a31245667fccd5227d60cac34a06855f
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 20 11:28:36 2012 -0500
+
+    Fixed issue #293 - libzmq doesn't follow ZMTP/1.0 spec
+
+ NEWS            |    4 +++-
+ src/encoder.cpp |    4 ++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 25c7cd0691b77770a4b85a13964e22d2274da4b7
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 20 11:05:26 2012 -0500
+
+    Updated for issue 332
+
+ NEWS |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 033907f2b810f8476c300c169e0fa6b912a56e22
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Thu Feb 16 12:14:56 2012 -0600
+
+    Updated NEWS for PR #36
+
+ NEWS |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit e4d7ad2643ac4e5391ae3939d3e19b6b0a05830f
+Merge: ec3e95a ba61dde
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 20 09:02:55 2012 -0700
+
+    Merge pull request #43 from jlopex/master
+    
+    Fixes issue LIBZMQ-332
+
+commit ba61dde6730aa79f05450a8b56b22dbf528eb57c
+Author: Javier Lopez <jlopex@cozybit.com>
+Date:   Mon Mar 19 19:13:56 2012 -0700
+
+    Fixes zeromq 2.1 not compiling on Android
+    
+    According to the libc documentation S_IWRITE is only for BSD
+    compatibility:
+    
+    http://www.gnu.org/s/hello/manual/libc/Permission-Bits.html
+    
+    This patch adds a check to determine the target platform and
+    use correct file access definition in each case:
+    
+    - For Linux and Android S_IWUSR is used.
+    - For other platforms S_IWRITE is used.
+    
+    Signed-off-by: Javier Lopez <jlopex@cozybit.com>
+
+ src/options.cpp |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 4b8ace2e6