Imported Debian patch 2.0.9.dfsg-1debian/2.0.9.dfsg-1

1 files changed, 7423 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c741998..e34c369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,1127 @@
-0MQ version 2.0.7 (Beta) was released on 2010/06/04.
+# Generated by Makefile. Do not edit.
 
-Changes since 2.0.6:
+commit ebf3089735329f0d083a992c98a9fd63b128346e
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sat Sep 4 18:38:20 2010 +0200
+
+    NEWS updated for 2.0.9
+
+ NEWS |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 1e8451961e498abd1da61e64f5baf48890e1563e
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 17:44:11 2010 +0200
+
+    Update .gitignore
+
+ .gitignore |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 32fd916c731901944e01c0cb445d32ce0d162693
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 17:42:33 2010 +0200
+
+    doc: Add 0MQ version to XHTML11 backend footer
+    
+    Thanks to Matt Weinstein for the suggestion.
+
+ doc/asciidoc.conf |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit a6d3629fb4f87c018c7ba2f8c4ff69f7eda07790
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 17:26:36 2010 +0200
+
+    build: Generate ChangeLog in 'make dist', ZIP automatically
+    
+    Change 'make dist' to generate the Git ChangeLog file, that way it doesn't
+    have to be manually updated nor kept in Git which causes unnecessary work.
+    
+    Also change 'make dist' to invoke 'dist-zip' automatically to generate a
+    ZIP as well as a .tar.gz.
+    
+    Thanks to http://live.gnome.org/Git/ChangeLog for the inspiration to
+    automatically generate ChangeLog.
+
+ ChangeLog    | 2724 ----------------------------------------------------------
+ Makefile.am  |   20 +-
+ configure.in |    2 +-
+ 3 files changed, 17 insertions(+), 2729 deletions(-)
+
+commit db7fe858d6356988fb9a9270c235178e523b2370
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sat Sep 4 17:12:08 2010 +0200
+
+    Broken device numbering reverted
+
+ include/zmq.h |   64 ++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 32 insertions(+), 32 deletions(-)
+
+commit 10227899b1ccdaecf709fbfc7b765e147baf3080
+Author: Dhammika Pathirana <dhammika@gmail.com>
+Date:   Fri Aug 27 18:06:37 2010 +0200
+
+    assert on malformed messages
+
+ src/zmq_decoder.cpp |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit c2f3b3b4458187085e148850068f9719c2567614
+Author: Jon Dyte <jon@totient.co.uk>
+Date:   Fri Aug 27 06:59:55 2010 +0200
+
+    forwarder and streamer devices handle multi-part messages correctly
+
+ src/forwarder.cpp |   17 ++++++++++++++---
+ src/queue.cpp     |   15 ++++++++-------
+ src/streamer.cpp  |   17 ++++++++++++++---
+ 3 files changed, 36 insertions(+), 13 deletions(-)
+
+commit ae567be0c295d9c18da5ba4be4f8403cc844a9a3
+Author: Ivo Danihelka <ivo@danihelka.net>
+Date:   Thu Aug 26 12:14:53 2010 +0200
+
+    improved null checking in zmq_term
+
+ AUTHORS     |    1 +
+ src/zmq.cpp |    7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 51a84c15ded2d70985c9d971ebdf3f3c9c18d590
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 16:12:33 2010 +0200
+
+    zmq::select_t, zmq_poll(): assert if FD_SETSIZE reached
+    
+    Ensure that 0MQ does not attempt to call select() on more than FD_SETSIZE
+    file descriptors.
+
+ src/select.cpp |    4 ++++
+ src/zmq.cpp    |    4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit f850190c16df0d55015dc15cd5c0c50289db5dda
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 16:10:14 2010 +0200
+
+    zmq.h: Fix typo and use of C99 comment
+
+ include/zmq.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ee3444ff93888a052cd1ba48aa22892f7077a7a0
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 16:00:26 2010 +0200
+
+    doc: Update zmq_socket(3) for 2.0.8 API changes
+
+ doc/zmq_socket.txt |   40 ++++++++++++++++++++++------------------
+ 1 files changed, 22 insertions(+), 18 deletions(-)
+
+commit 26b39bcdef390f45bb316c4488b51470c27086e2
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:55:41 2010 +0200
+
+    Revert "Added man page for the zmq_device method"
+    
+    This reverts commit f575f252c99c99d3622f313d6bbad6635197a1e4.
+    
+    Conflicts:
+    
+    	doc/zmq_device.txt
+
+ doc/zmq_device.txt |   99 ----------------------------------------------------
+ 1 files changed, 0 insertions(+), 99 deletions(-)
+
+commit 8800ac7de5d50426b0459ebea4568bb77954ea3d
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:55:19 2010 +0200
+
+    Revert "Added clean target that deletes generated man pages"
+    
+    This reverts commit 6cd90304476c1c6873d67068009def63e520b848.
+
+ doc/Makefile.am |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit 32baeb610e779862b58c56f66571b01599743a9e
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:55:11 2010 +0200
+
+    Revert "Various changes to documentation project:"
+    
+    This reverts commit 77a3c36ff1f11215229a4efdb821a3cb83a9d6fc.
+
+ doc/asciidoc.conf         |   15 ------
+ doc/zmq.txt               |   19 +++++++
+ doc/zmq_bind.txt          |    9 +++-
+ doc/zmq_close.txt         |    4 ++
+ doc/zmq_connect.txt       |    4 ++
+ doc/zmq_cpp.txt           |    4 ++
+ doc/zmq_deviced.txt       |  123 ---------------------------------------------
+ doc/zmq_errno.txt         |    4 ++
+ doc/zmq_forwarder.txt     |    4 ++
+ doc/zmq_getsockopt.txt    |    4 ++
+ doc/zmq_init.txt          |    4 ++
+ doc/zmq_inproc.txt        |    4 ++
+ doc/zmq_ipc.txt           |    4 ++
+ doc/zmq_msg_close.txt     |    4 ++
+ doc/zmq_msg_copy.txt      |    4 ++
+ doc/zmq_msg_data.txt      |    4 ++
+ doc/zmq_msg_init.txt      |    4 ++
+ doc/zmq_msg_init_data.txt |    4 ++
+ doc/zmq_msg_init_size.txt |    4 ++
+ doc/zmq_msg_move.txt      |    4 ++
+ doc/zmq_msg_size.txt      |    4 ++
+ doc/zmq_pgm.txt           |    5 ++-
+ doc/zmq_poll.txt          |    4 ++
+ doc/zmq_queue.txt         |    4 ++
+ doc/zmq_recv.txt          |    4 ++
+ doc/zmq_send.txt          |    4 ++
+ doc/zmq_setsockopt.txt    |    4 ++
+ doc/zmq_socket.txt        |   31 ++++++------
+ doc/zmq_streamer.txt      |    4 ++
+ doc/zmq_strerror.txt      |    4 ++
+ doc/zmq_tcp.txt           |    4 ++
+ doc/zmq_term.txt          |    5 ++
+ doc/zmq_version.txt       |    4 ++
+ 33 files changed, 155 insertions(+), 156 deletions(-)
+
+commit 4cb6dbd52f5ab65350a448ceb07ff77eacc2b84c
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:55:03 2010 +0200
+
+    Revert "Reverting 'clean' change to Makefile"
+    
+    This reverts commit c51de31f2fd31f782e419bfac2fb8d40d689f3e3.
+
+ doc/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 48d3e2d6607499b8c5feb1258c9bd40519923c69
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:54:53 2010 +0200
+
+    Revert "Removed empty man pages for old standalone devices"
+    
+    This reverts commit 6ff193999d96487f7aa7e578980ab5554e61d8dc.
+
+ doc/asciidoc.conf     |    2 +-
+ doc/zmq_forwarder.txt |   29 +++++++++++++++++++++++++++++
+ doc/zmq_queue.txt     |   29 +++++++++++++++++++++++++++++
+ doc/zmq_streamer.txt  |   29 +++++++++++++++++++++++++++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+commit 6c393f53e28f41118eed9a8d034d8d46f2555572
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:54:34 2010 +0200
+
+    Revert "Further cleanups on reference manual"
+    
+    This reverts commit 13f3481e127a6b2390e847af6b01ee88f1b4ae61.
+    
+    Conflicts:
+    
+    	doc/zmq_device.txt
+    	doc/zmq_tcp.txt
+
+ doc/zmq.txt            |   22 +++++++++++------
+ doc/zmq_bind.txt       |   13 +++-------
+ doc/zmq_connect.txt    |   13 +++-------
+ doc/zmq_device.txt     |   60 +++++++++++------------------------------------
+ doc/zmq_deviced.txt    |   50 +++++++++++----------------------------
+ doc/zmq_getsockopt.txt |    2 +-
+ doc/zmq_pgm.txt        |    4 +-
+ doc/zmq_poll.txt       |    4 +-
+ doc/zmq_setsockopt.txt |    2 +-
+ doc/zmq_tcp.txt        |    8 +++---
+ 10 files changed, 60 insertions(+), 118 deletions(-)
+
+commit 6647e61243fdfbdc600ef3bfbd15b7c2ca6e853e
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:51:40 2010 +0200
+
+    Revert "Small improvements to zmq_device(3) page"
+    
+    This reverts commit 96bcc9e6cf73781c31042278eb960c0363a78805.
+
+ doc/zmq_device.txt |   32 ++++++++++----------------------
+ 1 files changed, 10 insertions(+), 22 deletions(-)
+
+commit 83d253d72d4fe83f4a001a7cfb4059ccc52b04e0
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Sat Sep 4 15:51:09 2010 +0200
+
+    Revert "Removed wip zmq_deviced from master"
+    
+    This reverts commit de0173754cc82f6c08875a892892f043a804554c.
+
+ doc/Makefile.am     |    2 +-
+ doc/zmq.txt         |    4 +-
+ doc/zmq_deviced.txt |  145 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 149 insertions(+), 2 deletions(-)
+
+commit 14853c2db528b3fd6eed84786053549e71f61bb7
+Author: Jon Dyte <jon@totient.co.uk>
+Date:   Thu Sep 2 07:52:02 2010 +0200
+
+    Prior to this patch prefix_tree asserts.
+    
+    This is because as it adds the 255th element at a node it attempts to calculate
+    the count member var which is an unsigned char via count = (255 -0) + 1; and
+    pass the result to realloc. Unfortunately the result is zero and realloc returns
+    null; the prefix_tree asserts. I have fixed it by making the count an unsigned
+    short.
+
+ src/prefix_tree.cpp |   12 ++++++------
+ src/prefix_tree.hpp |    2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 8ec0743c7551de3c76126d080961cece732370f1
+Author: Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE>
+Date:   Thu Sep 2 07:33:57 2010 +0200
+
+    Fix for signaler_t on HP-UX and AIX platforms
+
+ AUTHORS          |    1 +
+ src/signaler.cpp |    6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d5b6f680a54c682da066e769c46075a4bc57bd55
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Thu Sep 2 07:26:14 2010 +0200
+
+    Mikael Kjaer added to AUTHORS
+
+ AUTHORS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 59315ebdcb565d23ba78ba0ca8581cef465fc9bd
+Author: Mikael Helbo Kjær <mhk@designtech.dk>
+Date:   Wed Sep 1 18:39:12 2010 +0200
+
+    Erasure of retired fd's in select.cpp causes an assertion in MSVC 2008 STL
+    
+    I was hitting an issue with an SCL enabled STL library in connection with the
+    way select_t::loop was erasing retired fd's. The problem as identified by the
+    SCL assertion was that by the time the iterator given to the erase method was
+    called it was considered invalid by the library. I am not sure this isn't just
+    a "quirk" of the MSVC STL library as the other code looks valid to me as well.
+
+ src/select.cpp |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 99ddfa7d65a4556bdbb68fd1831e2de73595f0c7
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Wed Sep 1 18:22:03 2010 +0200
+
+    maint: will become 2.0.9
+
+ builds/msvc/platform.hpp |    2 +-
+ configure.in             |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1e089f7163c8c59b60b39742ee4bc40e1ca843c5
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Aug 25 13:11:20 2010 +0200
+
+    Update ChangeLog for v2.0.8
+
+ ChangeLog |  493 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 493 insertions(+), 0 deletions(-)
+
+commit c9076c5d8b9b69f4e1bf797127735a563b712eb9
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Aug 25 12:50:16 2010 +0200
+
+    Basic documentation for XREQ/XREP socket types
+    
+    Add some basic documentation for XREQ/XREP socket types, including
+    a brief description of the most common use case (REQ -> XREP) and (XREQ ->
+    REP).
+
+ doc/zmq_socket.txt |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 59 insertions(+), 0 deletions(-)
+
+commit 6d275a8788ad06dda451845402877010f114d6d4
+Merge: 98bea86 d788c1f
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 25 12:09:55 2010 +0200
+
+    Updated NEWS for stable 2.0.8 release
+
+commit 98bea86240c3e2cb0c1c9832f5660994a0a11f34
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 25 11:43:52 2010 +0200
+
+    Updated NEWS for stable 2.0.8 release
+
+ NEWS |   54 ++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 48 insertions(+), 6 deletions(-)
+
+commit d788c1f7e49305976f3e1d0540c5671c47348880
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 25 11:43:52 2010 +0200
+
+    Updated NEWS for stable 2.0.8 release
+
+ NEWS |   47 +++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 41 insertions(+), 6 deletions(-)
+
+commit c06a3cc5101a36bf70c593937374371cafbacfc3
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Aug 25 11:24:24 2010 +0200
+
+    Update version number to 2.0.8
+
+ builds/msvc/platform.hpp |    2 +-
+ configure.in             |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b66dd7afd20b82668a3d7756900c91680bd1d91e
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Aug 25 09:50:45 2010 +0200
+
+    zmq_stopwatch_stop: Don't return EFAULT
+    
+    Function returning unsigned long int cannot return (-1)
+
+ src/zmq.cpp |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 2b2accb8bf574bfb7d85893696f477d5bc6ca272
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Aug 21 15:47:10 2010 +0200
+
+    Added calls to zmq_msg_close in examples
+
+ doc/zmq_recv.txt |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit c52d1f2d47ac93e391ff707b50245aa33d7e8323
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Aug 21 13:46:03 2010 +0200
+
+    Fixed example for multipart zmq_recv()
+
+ doc/zmq_recv.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 87612be91d4ff5252613196f061bd89d3bce25ec
+Merge: de0035b 5be54b9
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Aug 20 01:06:34 2010 +0200
+
+    Merge branch '46_device_robustness'
+
+commit de0035b6d9fc1c5423d10fbac468b0e17188510f
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Thu Aug 19 14:31:04 2010 +0200
+
+    Fixed git URL in README
+
+ README |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7aba2d10338727b030c3a9ff4ec34f7086ea5023
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Wed Aug 18 12:00:26 2010 +0200
+
+    documentation leftover from v2.0.6 cleaned in zmq(7)
+
+ doc/zmq.txt |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit de0173754cc82f6c08875a892892f043a804554c
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 11 21:12:10 2010 +0200
+
+    Removed wip zmq_deviced from master
+
+ doc/Makefile.am     |    2 +-
+ doc/zmq.txt         |    4 +-
+ doc/zmq_deviced.txt |  145 ---------------------------------------------------
+ 3 files changed, 2 insertions(+), 149 deletions(-)
+
+commit 5be54b912029381736ee8b8798f95cc9a2544a70
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 11 17:05:19 2010 +0200
+
+    46 - Devices vulnerable to invalid messages
+    
+    http://github.com/zeromq/zeromq2/issues#issue/46
+    Invalid messages are now discarded silently, instead of causing an assertion
+    failure.
+
+ src/xrep.cpp |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit e74d350068e8a7d2becbd791f19e2c1ef20afae5
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 11 17:00:12 2010 +0200
+
+    Fixed (un)signed type errors in get/setsockopt manual
+
+ doc/zmq_getsockopt.txt |   10 +++++-----
+ doc/zmq_setsockopt.txt |   10 +++++-----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+commit a12f446c4c160e6fb969c35ff01578e5f0965ecc
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 10 12:36:56 2010 +0200
+
+    Modified zmq_tcp(7) to emphasize wildcard interfaces
+
+ doc/zmq_tcp.txt |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit b6cdd369e328ceca2c46758d92ad8ea6a1f59cd7
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sun Aug 8 11:43:32 2010 +0200
+
+    Added error checking (EFAULT) for null arguments
+    
+    * Fixed zmq_term, zmq_socket, zmq_close, zmq_setsockopt,
+    * zmq_getsockopt, zmq_bind, zmq_connect, zmq_send,
+    * zmq_recv, zmq_poll, zmq_device, zmq_stopwatch_stop
+    * Updated Reference Manual for these methods
+
+ doc/zmq_bind.txt       |    2 +
+ doc/zmq_close.txt      |    3 +-
+ doc/zmq_connect.txt    |    2 +
+ doc/zmq_device.txt     |   13 ++++++++-
+ doc/zmq_getsockopt.txt |    2 +
+ doc/zmq_poll.txt       |    2 +
+ doc/zmq_recv.txt       |    2 +
+ doc/zmq_send.txt       |    2 +
+ doc/zmq_setsockopt.txt |    2 +
+ doc/zmq_socket.txt     |    3 +-
+ doc/zmq_term.txt       |    3 +-
+ src/zmq.cpp            |   63 ++++++++++++++++++++++++++++++++++++-----------
+ 12 files changed, 79 insertions(+), 20 deletions(-)
+
+commit 677b3d906acc97c26855bdc31126492878ad6292
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Aug 7 20:55:07 2010 +0200
+
+    Added not-null assertions on pointer arguments in C API functions
+    * zmq_term
+    * zmq_socket
+    * zmq_close
+    * zmq_setsockopt
+    * zmq_getsockopt
+    * zmq_bind
+    * zmq_connect
+    * zmq_send
+    * zmq_recv
+    * zmq_poll
+    * zmq_device
+    * zmq_stopwatch_stop
+
+ src/zmq.cpp |   15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit b579aa9510fe6897735ba2aae5db399ef89ad573
+Merge: 6d35e82 2100a91
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Fri Aug 6 12:01:40 2010 +0200
+
+    Merge branch 'master' of github.com:zeromq/zeromq2
+
+commit 6d35e82db4178b936b33c2eaa6a9f4a2b597e2f3
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Fri Aug 6 12:00:57 2010 +0200
+
+    Fix uninitialized use of nbytes in signaler fix
+
+ src/signaler.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2100a9133312f7feecd22c4f809c8f3912c93274
+Merge: 78e9ee8 16b43e6
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Aug 6 11:09:29 2010 +0200
+
+    Merge branch 'master' of github.com:zeromq/zeromq2
+
+commit 16b43e657b44902b3b45fbb01228c813cf27ad39
+Merge: 9ac2ff4 96bcc9e
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Thu Aug 5 23:41:49 2010 +0200
+
+    Merge branch 'master' of github.com:zeromq/zeromq2
+
+commit 9ac2ff449ccfb71cb1f3c9d7b2cf67c440539228
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Thu Aug 5 23:40:30 2010 +0200
+
+    zmq::signaler_t: Restart syscalls on EINTR
+    
+    This patch restarts the send() or recv() inside zmq::signaler_t if the call fails
+    due to EINTR.
+
+ src/signaler.cpp |   22 +++++++++++++++++-----
+ 1 files changed, 17 insertions(+), 5 deletions(-)
+
+commit 78e9ee84bf0e89eeb7134771b1f501ea0f9ccd9d
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Thu Aug 5 18:49:49 2010 +0200
+
+    Fixed MSVC project for PULL/PUSH
+
+ builds/msvc/libzmq/libzmq.vcproj |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 96bcc9e6cf73781c31042278eb960c0363a78805
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 17:06:38 2010 +0200
+
+    Small improvements to zmq_device(3) page
+    
+    * Clarified broker model and proxy model
+    * Added example of proxy model
+
+ doc/zmq_device.txt |   32 ++++++++++++++++++++++----------
+ 1 files changed, 22 insertions(+), 10 deletions(-)
+
+commit 13f3481e127a6b2390e847af6b01ee88f1b4ae61
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 16:05:25 2010 +0200
+
+    Further cleanups on reference manual
+    
+    - fixed unwrapped text in new man pages
+    - fixed over-long lines in older pages, where possible
+    - removed reference to old standalong devices from index page
+    - added refernce to new zmq_device[3] documented from index page
+    - some minor spelling corrections
+
+ doc/zmq.txt            |   22 ++++++------------
+ doc/zmq_bind.txt       |   13 +++++++---
+ doc/zmq_connect.txt    |   13 +++++++---
+ doc/zmq_device.txt     |   56 ++++++++++++++++++++++++++++++++++++-----------
+ doc/zmq_deviced.txt    |   50 ++++++++++++++++++++++++++++++------------
+ doc/zmq_getsockopt.txt |    2 +-
+ doc/zmq_pgm.txt        |    4 +-
+ doc/zmq_poll.txt       |    4 +-
+ doc/zmq_setsockopt.txt |    2 +-
+ doc/zmq_tcp.txt        |   11 +++++----
+ 10 files changed, 117 insertions(+), 60 deletions(-)
+
+commit 6ff193999d96487f7aa7e578980ab5554e61d8dc
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 15:07:15 2010 +0200
+
+    Removed empty man pages for old standalone devices
+
+ doc/asciidoc.conf     |    2 +-
+ doc/zmq_forwarder.txt |   29 -----------------------------
+ doc/zmq_queue.txt     |   29 -----------------------------
+ doc/zmq_streamer.txt  |   29 -----------------------------
+ 4 files changed, 1 insertions(+), 88 deletions(-)
+
+commit c51de31f2fd31f782e419bfac2fb8d40d689f3e3
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 14:56:58 2010 +0200
+
+    Reverting 'clean' change to Makefile
+
+ doc/Makefile.am |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 77a3c36ff1f11215229a4efdb821a3cb83a9d6fc
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 14:43:33 2010 +0200
+
+    Various changes to documentation project:
+    
+    * Added documentation for zmq_deviced, which we're developing
+    * Created consistent page footer in documentation template
+    * Page footer notes doc authors and copyright statement
+
+ doc/asciidoc.conf         |   15 ++++++
+ doc/zmq.txt               |   19 -------
+ doc/zmq_bind.txt          |    9 +---
+ doc/zmq_close.txt         |    4 --
+ doc/zmq_connect.txt       |    4 --
+ doc/zmq_cpp.txt           |    4 --
+ doc/zmq_deviced.txt       |  123 +++++++++++++++++++++++++++++++++++++++++++++
+ doc/zmq_errno.txt         |    4 --
+ doc/zmq_forwarder.txt     |    4 --
+ doc/zmq_getsockopt.txt    |    4 --
+ doc/zmq_init.txt          |    4 --
+ doc/zmq_inproc.txt        |    4 --
+ doc/zmq_ipc.txt           |    4 --
+ doc/zmq_msg_close.txt     |    4 --
+ doc/zmq_msg_copy.txt      |    4 --
+ doc/zmq_msg_data.txt      |    4 --
+ doc/zmq_msg_init.txt      |    4 --
+ doc/zmq_msg_init_data.txt |    4 --
+ doc/zmq_msg_init_size.txt |    4 --
+ doc/zmq_msg_move.txt      |    4 --
+ doc/zmq_msg_size.txt      |    4 --
+ doc/zmq_pgm.txt           |    5 +--
+ doc/zmq_poll.txt          |    4 --
+ doc/zmq_queue.txt         |    4 --
+ doc/zmq_recv.txt          |    4 --
+ doc/zmq_send.txt          |    4 --
+ doc/zmq_setsockopt.txt    |    4 --
+ doc/zmq_socket.txt        |   31 ++++++------
+ doc/zmq_streamer.txt      |    4 --
+ doc/zmq_strerror.txt      |    4 --
+ doc/zmq_tcp.txt           |    4 --
+ doc/zmq_term.txt          |    5 --
+ doc/zmq_version.txt       |    4 --
+ 33 files changed, 156 insertions(+), 155 deletions(-)
+
+commit 6cd90304476c1c6873d67068009def63e520b848
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 14:42:21 2010 +0200
+
+    Added clean target that deletes generated man pages
+
+ doc/Makefile.am |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit f575f252c99c99d3622f313d6bbad6635197a1e4
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 14:41:43 2010 +0200
+
+    Added man page for the zmq_device method
+
+ doc/zmq_device.txt |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 92 insertions(+), 0 deletions(-)
+
+commit 11a410b65827a3958fb5f417c29e95c1953a0b42
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 4 14:38:56 2010 +0200
+
+    Renamed ZMQ_UPSTREAM to ZMQ_PULL, and ZMQ_DOWNSTREAM to ZMQ_PUSH.  Left the old
+    definitions as aliases, to be removed in release 3.0.  Also renamed the source
+    files implementing these two socket types.  This change does not break existing
+    applications nor bindings, but allows us to fix the documentation and user guide
+    now, rather than keeping the old (confusing) names.
+
+ include/zmq.h      |   61 ++++++++++++++++---------------
+ src/Makefile.am    |    8 ++--
+ src/app_thread.cpp |   12 +++---
+ src/downstream.cpp |  101 ----------------------------------------------------
+ src/downstream.hpp |   61 -------------------------------
+ src/pull.cpp       |   98 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/pull.hpp       |   62 ++++++++++++++++++++++++++++++++
+ src/push.cpp       |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/push.hpp       |   61 +++++++++++++++++++++++++++++++
+ src/upstream.cpp   |   98 --------------------------------------------------
+ src/upstream.hpp   |   62 --------------------------------
+ 11 files changed, 364 insertions(+), 361 deletions(-)
+
+commit 544b36da68729daffefa8f40d2efed5945851a01
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Fri Jul 30 16:49:06 2010 +0200
+
+    XREQ: Correct behaviour on hitting ZMQ_HWM
+    
+    This reverts part of commit 84e0c7991a9b316ed571533abc628cc1175750a3 to get
+    correct ZMQ_HWM semantics with XREQ sockets:
+    
+    When sending a message to an XREQ socket, the underlying pipe is selected in
+    a round-robin fashion. If an underlying pipe is full it is skipped. If there
+    are no underlying pipes, or all underlying pipes are full then zmq_send()
+    shall block or return EAGAIN, depending on whether or not the call is blocking.
+    Messages are never dropped.
+
+ src/xreq.cpp |   27 +++------------------------
+ src/xreq.hpp |    3 ---
+ 2 files changed, 3 insertions(+), 27 deletions(-)
+
+commit 66470b2c55d74fb137211f4264bbfc5e3f454534
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Mon Jul 26 12:24:00 2010 +0200
+
+    perf: fix typo
+
+ perf/local_thr.cpp  |    2 +-
+ perf/remote_thr.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 10533a560b4af1d3dae63c87c737e25bbdb78998
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Wed Jul 14 18:31:17 2010 +0200
+
+    pipe: check_read() should check for message delimiter
+
+ src/pipe.cpp  |   27 ++++++++++++++++++++++-----
+ src/pipe.hpp  |    3 +++
+ src/ypipe.hpp |   11 +++++++++++
+ 3 files changed, 36 insertions(+), 5 deletions(-)
+
+commit e1c596b37eef2c2c72c605d7bf4a5c97050add6b
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Sat Jul 24 16:57:13 2010 +0200
+
+    Make sure lwm > 0 when hwm > 0
+
+ src/pipe.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5b1a6a4bea1cebe860769f82702410f6c1d0ab1b
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Jul 21 17:33:40 2010 +0200
+
+    Issue 42 - getaddrinfo() fails
+
+ src/ip.cpp |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+commit aedf3f808befd8cf32a16e34b907c60c79eabfd7
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Mon Jul 19 08:38:24 2010 +0200
+
+    EHOSTUNREACH is a valid return value from recv()
+
+ src/tcp_socket.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 269904361b565efa54a106e3eda96091320439bd
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Tue Jul 13 11:46:56 2010 +0200
+
+    minor comment clarification
+
+ src/tcp_connecter.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit da49e5a4dd4602bf893193a5e6e64af54695b51c
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Tue Jul 13 07:57:29 2010 +0200
+
+    devices exit in case of context termination
+
+ src/forwarder.cpp |   15 +++++++++++++--
+ src/queue.cpp     |   42 +++++++++++++++++++++++++++++++++++-------
+ src/streamer.cpp  |   15 +++++++++++++--
+ 3 files changed, 61 insertions(+), 11 deletions(-)
+
+commit ca057c7db8dcb2384e2498c938f3d83f64b78a7d
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Sat Jul 10 22:57:47 2010 +0200
+
+    Fix identity generation for transient inproc connections
+
+ src/socket_base.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1f61c87ac527e2a75cabbce4ea4c5f916f4532e7
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Wed Jul 7 17:15:32 2010 +0200
+
+    issue 40 - nbytes != -1 (tcp_socket.cpp:216)
+
+ src/tcp_socket.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit fd707fedc59124ed627780efed081acf33f455d2
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Tue Jul 6 22:47:07 2010 +0200
+
+    issue 38 - Assertion failed: fetched (xrep.cpp:196)
+
+ src/xrep.cpp |   20 ++++++++++++--------
+ src/xrep.hpp |    6 ++++++
+ 2 files changed, 18 insertions(+), 8 deletions(-)
+
+commit 805af8241d7450fe1e60174739a78325677897f6
+Author: Martin Lucina <mato@kotelna.sk>
+Date:   Wed Jun 30 16:23:07 2010 +0200
+
+    asciidoc.conf was missing from distribution tarball
+
+ doc/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0ab65324195ad70205514d465b03d851a6de051c
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Jun 29 21:08:41 2010 +0200
+
+    Prevent socket reuse by second bind, on win32
+
+ src/tcp_listener.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 79a3d07c8587e840548791efc314b0184c584881
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Tue Jun 29 07:45:11 2010 +0200
+
+    MSVC build fixed
+
+ src/msg_store.cpp |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit ba91644fdb48cec97edc6965c4ca7ab564a3513f
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sat Jun 26 20:11:40 2010 +0200
+
+    msg_store added to MSVC build
+
+ builds/msvc/libzmq/libzmq.vcproj |    8 ++++++++
+ src/msg_store.cpp                |    2 ++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 1dda8a2aaabd3b7705b0ecd67d6d9737d1978946
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Jun 25 18:35:42 2010 +0200
+
+    Used more expressive variable names
+
+ src/msg_store.cpp |   73 +++++++++++++++++++++++-----------------------------
+ 1 files changed, 32 insertions(+), 41 deletions(-)
+
+commit fca2e8e8cc30bcd134839f6d0f5f9963323dad2b
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Mon Jun 21 15:06:51 2010 +0200
+
+    Add SWAP support
+
+ src/Makefile.am     |    2 +
+ src/msg_store.cpp   |  313 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/msg_store.hpp   |  114 +++++++++++++++++++
+ src/pipe.cpp        |  114 +++++++++++++++----
+ src/pipe.hpp        |   29 ++++--
+ src/session.cpp     |    4 +-
+ src/socket_base.cpp |    8 +-
+ 7 files changed, 545 insertions(+), 39 deletions(-)
+
+commit 10c28c1fc2f06c93e12a7c60f79a315cec7c5a52
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Sat Jun 19 20:46:16 2010 +0200
+
+    Revive reader on pipe termination
+
+ src/pipe.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2c3913bb19fa95e7decaa7967e2469dc428e46b0
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Sat Jun 19 19:46:35 2010 +0200
+
+    fix double free error in PAIR socket
+
+ src/pair.cpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit cff7ba2315c0f62fa3679afa24ecea88da38a365
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Thu Jun 17 17:09:51 2010 +0200
+
+    Windows build fixed
+
+ builds/msvc/c_local_lat/c_local_lat.vcproj   |    4 ----
+ builds/msvc/c_local_thr/c_local_thr.vcproj   |    4 ----
+ builds/msvc/c_remote_lat/c_remote_lat.vcproj |    4 ----
+ builds/msvc/c_remote_thr/c_remote_thr.vcproj |    4 ----
+ include/zmq_utils.h                          |    8 ++++++++
+ src/zmq.cpp                                  |    1 +
+ 6 files changed, 9 insertions(+), 16 deletions(-)
+
+commit 7f01e9970d211235fc8057de6dc41ba8ceafe795
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Thu Jun 17 16:51:53 2010 +0200
+
+    stopwatch returned to libzmq
+
+ include/zmq.h       |    2 +
+ include/zmq_utils.h |   49 +++++++++++++++++++++++++++++
+ perf/Makefile.am    |    9 ++---
+ perf/helpers.cpp    |   86 ---------------------------------------------------
+ perf/helpers.h      |   40 -----------------------
+ perf/local_lat.cpp  |    4 +-
+ perf/local_thr.cpp  |    6 ++--
+ perf/remote_lat.cpp |    6 ++--
+ perf/remote_thr.cpp |    4 +-
+ src/Makefile.am     |    2 +-
+ src/zmq.cpp         |   63 +++++++++++++++++++++++++++++++++++++
+ 11 files changed, 129 insertions(+), 142 deletions(-)
+
+commit 4777fe4010572d381a2ad8eb63df2fc5fb7e6642
+Author: Martin Hurton <hurtonm@gmail.com>
+Date:   Thu Jun 17 12:45:14 2010 +0200
+
+    pipe: fix bug in rollback() method
+    
+    The msgs_written variable keeps track how many complete
+    messages have been written so far. The rollback operation drops all
+    fragments of the last incomplete message so it shouldn't
+    change this variable at all.
+
+ src/pipe.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 9151de38959a21829d4ab60324d6750d2e1a4357
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Thu Jun 17 11:01:18 2010 +0200
+
+    generate identity for transient inproc connections
+
+ src/socket_base.cpp |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 341e8a267309179bbb8249845e7efb14faf93d4d
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Tue Jun 15 14:01:44 2010 +0200
+
+    test commit
+
+ AUTHORS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 9858447fad3260cb16b1f2e56a14cfe3db737a36
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Tue Jun 15 08:01:43 2010 +0200
+
+    getsockopt documentation fixed
+
+ doc/zmq_getsockopt.txt |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit ac90b7e0ba497bfec09d7a69a2e01dc6d94a9c9a
+Author: Brian Buchanan <bwb@holo.org>
+Date:   Fri Jun 11 08:03:34 2010 +0200
+
+    issue 35 - ZMQ_RCVMORE sometimes erroneously returns false
+
+ AUTHORS             |    1 +
+ src/socket_base.cpp |    9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 5ee355d1880bc7391c199ea29adc620ceb0d96f1
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Fri Jun 11 07:02:36 2010 +0200
+
+    if connect asserts, exact error is reported
+
+ src/tcp_connecter.cpp |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 27877d73ea7dd972a773c7e960706130daaf5925
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Fri Jun 11 06:55:30 2010 +0200
+
+    EHOSTUNREACH is acceptable outcome from connect
+
+ src/tcp_connecter.cpp |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit c818b14bbd261aa836400e9dfb4848117dd2edb6
+Author: Piotr Trojanek <piotr.trojanek@gmail.com>
+Date:   Thu Jun 10 12:57:42 2010 +0200
+
+    clearing thread info structure
+
+ src/ctx.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+comm