fixing shutdown issue on OS X -- 1760

2 files changed, 4 insertions, 2 deletions

diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index a7f3ceae..e30e019a 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -302,7 +302,8 @@ MHD_connection_close (struct MHD_Connection *connection,
   struct MHD_Daemon *daemon;
 
   daemon = connection->daemon;
-  SHUTDOWN (connection->socket_fd, SHUT_RDWR);
+  SHUTDOWN (connection->socket_fd, 
+            (connection->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR);
   connection->state = MHD_CONNECTION_CLOSED;
   if ( (NULL != daemon->notify_completed) &&
        (MHD_YES == connection->client_aware) )
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 280d7789..2b8eac5f 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -2445,7 +2445,8 @@ close_all_connections (struct MHD_Daemon *daemon)
       abort();
     }
   for (pos = daemon->connections_head; pos != NULL; pos = pos->next)    
-    SHUTDOWN (pos->socket_fd, SHUT_RDWR);    
+    SHUTDOWN (pos->socket_fd, 
+              (pos->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR);    
   if (0 != pthread_mutex_unlock(&daemon->cleanup_connection_mutex))
     {
 #if HAVE_MESSAGES