Fix a busy loop and socket leak
(cherry picked from commit d16bdb968e2d1ef40e1cc109b79a4a0f3322b61f)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>