Imported Debian patch 2.1.7-1debian/2.1.7-1

1 files changed, 249 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a9a3e7..f15734e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,254 @@
 # Generated by Makefile. Do not edit.
 
+commit c35f65a82f1dace3a0b9afc5185dc3efc35595b5
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Thu May 12 12:07:51 2011 +0200
+
+    Updated NEWS for 2.1.7
+
+ NEWS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dae5a6cb9e589e2471558dc86c55202558e918c2
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sun May 8 09:03:49 2011 +0200
+
+    Async connect doesn't fail on WSAENETDOWN
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ NEWS                  |    9 +++-
+ src/err.cpp           |  112 ++++++++++++++++++++++++++-----------------------
+ src/err.hpp           |   12 +++++
+ src/tcp_connecter.cpp |   10 ++--
+ 4 files changed, 82 insertions(+), 61 deletions(-)
+
+commit 46738270c22c134b8bbd7546ba4c6864b42f4c75
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sat Apr 9 09:46:59 2011 +0200
+
+    Missing ENOTSOCK added on Win32
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ include/zmq.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 52318cf705f9b0a73e88b8296d10291f7ba22a86
+Merge: c42d156 141a001
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat May 7 07:23:21 2011 +0200
+
+    Updated NEWS
+
+commit c42d156fb94b5131d385f08ff93659ffd2944e21
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat May 7 07:20:10 2011 +0200
+
+    Updated NEWS
+
+ NEWS |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 141a001b046a1206336642b7aa401cbd5e82b826
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri May 6 17:09:36 2011 +0200
+
+    Updated news for issue 211
+
+ NEWS |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 9a08c71d7d63544d55620391d12fab4269e3a4df
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri May 6 17:03:18 2011 +0200
+
+    Fixed issue 211 - REP assert on missing envelope
+
+ src/rep.cpp  |   21 ++++++++++++++-------
+ src/xrep.cpp |   12 +++++++++++-
+ src/xrep.hpp |    1 +
+ 3 files changed, 26 insertions(+), 8 deletions(-)
+
+commit ddffe5db3351fbaff6086157e6a351e935d37d2e
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Fri May 6 15:51:56 2011 +0200
+
+    Current pipe pointer in XREP out of range -- fixed.
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ src/xrep.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 96861b9d405663d71926b21843220481ebd33062
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sat Apr 9 09:35:34 2011 +0200
+
+    Run-time checking for context & socket validity added
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ NEWS                   |    3 +++
+ doc/zmq_bind.txt       |    4 ++--
+ doc/zmq_close.txt      |    4 ++--
+ doc/zmq_connect.txt    |    4 ++--
+ doc/zmq_getsockopt.txt |    4 ++--
+ doc/zmq_recv.txt       |    4 ++--
+ doc/zmq_send.txt       |    4 ++--
+ doc/zmq_setsockopt.txt |    4 ++--
+ doc/zmq_term.txt       |    2 +-
+ src/ctx.cpp            |    9 +++++++++
+ src/ctx.hpp            |    6 ++++++
+ src/socket_base.cpp    |    9 +++++++++
+ src/socket_base.hpp    |    6 ++++++
+ src/zmq.cpp            |   32 ++++++++++++++++----------------
+ 14 files changed, 64 insertions(+), 31 deletions(-)
+
+commit 24a669f96d44acd03e03212e8ad5c32ffa756f53
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Wed May 4 12:43:23 2011 +0200
+
+    Tore Halvorsen added to the AUTHORS file
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ AUTHORS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4536f014071dd85c5520057f902e288c65e3cd2b
+Author: Tore Halvorsen <tore.halvorsen@gmail.com>
+Date:   Wed May 4 12:41:10 2011 +0200
+
+    Accessing an iterator after it is accessed is not valid.
+    
+    Moving the erase after the access and check agains current_id.
+
+ src/xrep.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8e740d555b5b4383995cb3d81ff44c1e7add2da4
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed May 4 15:52:26 2011 +0200
+
+    Clarified zmq_poll man page that timeout resolution is 1msec
+
+ NEWS             |    1 +
+ doc/zmq_poll.txt |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 71cb36d04bd74ca82aca3868e665831733995be7
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue May 3 17:30:21 2011 +0200
+
+    Fixed issue 206
+
+ NEWS            |    2 ++
+ src/decoder.cpp |    4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 0fc54c9d14c8ff137e2b8aff6e472dcefb3a0c02
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon May 2 20:09:11 2011 +0200
+
+    Updated NEWS
+
+ NEWS |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 16b725ddc978633b6349eb9353263c076ad9b702
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Mon May 2 19:28:51 2011 +0200
+
+    Current inpipe remains unchaged in XREP when other pipe terminates
+    
+    When an inpipe terminated within XREP, it was erased from the array
+    and thus current_in (which is an index) pointed to a different
+    element in the array. This caused problems when we were in the
+    middle of reading a multipart message.
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ src/xrep.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c688f7536ea1a2f4f8d82fcc40f962bea230dd9e
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Apr 30 09:13:28 2011 +0200
+
+    Another fix to PUB sockets with multipart messages
+
+ src/dist.cpp |   18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+commit 10f0e7c71ed31530d3a56f9ae99ef926bfcb1090
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Apr 30 07:37:17 2011 +0200
+
+    Updated NEWS for issue 191
+
+ NEWS |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 24e56e19a82035950dd721bb9d970294f508737e
+Merge: 33018b3 b6befaa
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Apr 30 07:36:30 2011 +0200
+
+    Merge branch 'issue191'
+
+commit b6befaad5d9ac6c4ccb13b1668b14696d7016c01
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Apr 30 07:36:16 2011 +0200
+
+    Message atomicity in pub sockets fixed - issue 191
+
+ src/dist.cpp |    4 +++-
+ src/dist.hpp |    3 ---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 33018b30287777bf19ac292e38861b0c4b7e2599
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Apr 29 09:24:16 2011 +0200
+
+    Updated NEWS
+
+ NEWS |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 7dc87c59ded306970763c928ff0c4c350e2a2453
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Fri Apr 29 07:23:30 2011 +0200
+
+    WSAENETUNREACH is a valid networking error
+    
+    Till now, 0MQ asserted on Windows when connect () returned
+    WSAENETUNREACH.
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ src/tcp_connecter.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit be403bf2ba1b61355cd0d2f8f6609408b71cde99
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Apr 29 09:22:29 2011 +0200
+
+    Downstreamed patch for issue 191
+
+ src/dist.cpp |   70 ++++++++++++++++++++++++++++++---------------------------
+ src/dist.hpp |   17 +++++++------
+ 2 files changed, 46 insertions(+), 41 deletions(-)
+
+commit 0ec42592f31faa5e98faa38961ee736d892e0783
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Apr 26 19:57:16 2011 +0200
+
+    Bumped version number for 2.1.7
+
+ include/zmq.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 commit ee185e241ec2a3091b9200cd5615cfa4f66e7a07
 Author: Pieter Hintjens <ph@imatix.com>
 Date:   Tue Apr 26 19:45:25 2011 +0200