This fixes problems with lost characters and failure to close
connections in some cases
(cherry picked from commit 1b76f4d5b6e247ebc1f3f1786c99eef1f0510c73)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>