Imported Upstream version 2.1.9upstream/2.1.9

114 files changed, 4049 insertions, 2680 deletions

diff --git a/AUTHORS b/AUTHORS
index 43768e5..7e785bf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Bob Beaty <rbeaty@peak6.com>
 Brian Buchanan <bwb@holo.org>
 Brett Cameron <Brett.Cameron@hp.com>
 Burak Arslan <burak-github@arskom.com.tr>
+Carl Clemens <carlclemens1@yahoo.com>
 Chia-liang Kao <clkao@clkao.org>
 Chris Rempel <csrl@gmx.com>
 Chris Wong <chris@chriswongstudio.com>
@@ -62,6 +63,8 @@ Thijs Terlouw <thijsterlouw@gmail.com>
 Toralf Wittner <toralf.wittner@gmail.com>
 Tore Halvorsen <tore.halvorsen@gmail.com>
 Vitaly Mayatskikh <v.mayatskih@gmail.com>
+Ghislain Putois <ghpu@infonie.fr>
+William Roberts <bill.c.roberts@gmail.com>
 
 Credits
 =======
diff --git a/ChangeLog b/ChangeLog
index f15734e..2349d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,649 @@
 # Generated by Makefile. Do not edit.
 
+commit 392c3771c22d0dfe793cc9c4ee5c27d18d38d428
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Aug 29 20:25:11 2011 +0200
+
+    Updated NEWS for 2.1.9
+
+ NEWS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bb7f41144b513ebf07698ade91c6d6c4e20bec77
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Aug 29 12:24:45 2011 +0200
+
+    Fixed NEWS to reflect RC status of 2.1.8
+
+ NEWS |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 4df43be69c3f25a4a5f96d379a59d6c6d6f214fa
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Wed Aug 17 18:41:02 2011 +0200
+
+    Fix the PGM support on win64
+    
+    On win64 the size of file descriptor is not the same as size of int.
+    The bug in PGM transport caused a runtime error because of this.
+    The problem is fixed now.
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ NEWS                 |    2 ++
+ src/pgm_receiver.cpp |    4 ++--
+ src/pgm_sender.cpp   |    8 ++++----
+ src/pgm_socket.cpp   |    8 ++++----
+ src/pgm_socket.hpp   |    7 ++++---
+ 5 files changed, 16 insertions(+), 13 deletions(-)
+
+commit 024c4c91098913c7488abde75e9ef0d3fee7e195
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 17 16:40:09 2011 +0200
+
+    Fixed compile error on win32
+
+ src/zmq.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 323138b81ca71e036200d666b95b96c9b6e58696
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 16 17:45:39 2011 +0200
+
+    Updated NEWS for Android build
+
+ NEWS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7b22dccf2fed4cd057876912991fdd61954d6dbc
+Author: Mikko Koppanen <mkoppanen@php.net>
+Date:   Mon Aug 15 19:09:04 2011 +0200
+
+    Added Android support
+    
+    Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
+
+ configure.in   |    6 ++++++
+ src/ip.cpp     |    2 +-
+ src/swap.cpp   |    2 +-
+ src/thread.cpp |    2 +-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 591e5887e6e32675a7520eac67621416f13bec35
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sun Aug 14 14:23:16 2011 +0200
+
+    Fixed issue 238
+
+ NEWS |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit ebfdfdf298525c993b8827fe6c7b6f753c56ca52
+Author: Martin Sustrik <sustrik@250bpm.com>
+Date:   Sun Aug 14 14:23:16 2011 +0200
+
+    select version zmq_poll reports invalid FDs
+    
+    Till now, passing invalid file descriptor to zmq_poll()
+    caused asseration. Now it returns error.
+    
+    Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
+
+ src/zmq.cpp |   18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+commit d6fbb80a19056cad02ee32e465b12cb0ba29c419
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Aug 13 00:27:13 2011 +0200
+
+    Fixed issue 239
+
+ NEWS         |    3 +++
+ src/swap.cpp |    2 --
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 317435e2835b41d98a885883631d024422f5c9ff
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Thu Aug 11 16:54:50 2011 +0200
+
+    usleep is void on Android
+
+ src/zmq.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7239640d0282902af047d391b4a41fb5cc914bd1
+Author: wroberts <wroberts@wroberts-P480.(none)>
+Date:   Wed Aug 10 13:23:37 2011 -0400
+
+    Added an ndk-build clean command to clean script and fixed usleep error.
+    
+    - Fixed incorrect directory removal in clean script
+
+ builds/android/clean.sh |    2 +-
+ src/zmq.cpp             |    3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit eeca373616e347e947ff73f1cf8c11f7b53fc1a8
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 10 18:18:15 2011 +0200
+
+    Updated NEWS for Android
+
+ NEWS |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 880e5c324031bc390bc88d07f5137ce31d1c8c69
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 10 17:58:16 2011 +0200
+
+    Fixed use of ANDROID macro
+
+ src/thread.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 98b96e7d8fd60605ad1498cd540b07dd7040f168
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 10 17:51:34 2011 +0200
+
+    Whitespace and comment changes
+
+ builds/android/build.sh |   35 ++++++++++++++++++++++-------------
+ builds/android/clean.sh |   15 ++++++++++-----
+ 2 files changed, 32 insertions(+), 18 deletions(-)
+
+commit f2b76414f70d462e7863e4d79f61227d7315cf9d
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Aug 10 17:13:40 2011 +0200
+
+    Added William Roberts to AUTHORS
+
+ AUTHORS |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7f2a522a85a2379120ad6d809be56b9f34e3b89b
+Author: wroberts <wroberts@wroberts-P480.(none)>
+Date: