[hamradio-commits] [dump1090] 363/389: B"H Merge branch 'master' of https://www.github.com/MalcolmRobb/dump1090 into socket_hang

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit e20e240130568b31e2fd87d7f3bd85cadbbf89d9
Merge: 8b4d5b3 65751ed
Author: hhm <heehooman+vcs-ci at gmail.com>
Date:   Sat Oct 4 21:36:51 2014 -0400

    B"H Merge branch 'master' of https://www.github.com/MalcolmRobb/dump1090 into socket_hang
    
    Conflicts:
    	net_io.c

 dump1090.c    | 131 +++++++++++++++++++++++++++++++++++++++++++---------------
 dump1090.h    |   5 ++-
 interactive.c |  31 +++++++-------
 mode_s.c      |  18 ++++----
 net_io.c      |  46 ++++++++++++---------
 5 files changed, 155 insertions(+), 76 deletions(-)

diff --cc net_io.c
index a1ccfda,f3a8397..fbb18b8
--- a/net_io.c
+++ b/net_io.c
@@@ -871,7 -862,8 +878,8 @@@ void modesReadFromClient(struct client 
  #else
          if ( (nread < 0) && (errno != EWOULDBLOCK)) { // Error, or end of file
  #endif
 -            modesFreeClient(c);
 +            modesCloseClient(c);
+             return;
          }
          if (nread <= 0) {
              break; // Serve next client

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git