From 4e158a22e536d63dc41400c39282297c67d4361d Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Wed, 7 Mar 2012 03:21:33 -0500
Subject: [PATCH] Fix bug affecting clean shutdown on OS X

---
 src/frontend/mosh-server.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index 6325803..69647ce 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -349,7 +349,11 @@ void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &network
 	/* fill buffer if possible */
 	ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
 	if ( bytes_read == 0 ) { /* EOF */
-	  return;
+	  if ( !network.has_remote_addr() ) {
+	    return;
+	  } else if ( !network.shutdown_in_progress() ) {
+	    network.start_shutdown();
+	  }
 	} else if ( bytes_read < 0 ) {
 	  perror( "read" );
 	  return;