1 files changed, 4 insertions, 3 deletions

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index a65757e3..958bf2ef 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1458,6 +1458,9 @@ transmit_error_response (struct MHD_Connection *connection,
 static void
 MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
 {
+  /* Do not update states of suspended connection */
+  if (connection->suspended)
+    return; /* States will be updated after resume. */
   while (1)
     {
 #if DEBUG_STATES
@@ -1510,9 +1513,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
             {
               if ((MHD_YES != try_grow_read_buffer (connection)) &&
                   (0 != (connection->daemon->options &
-                         MHD_USE_INTERNAL_POLLING_THREAD)) &&
-                  (! connection->suspended) &&
-                  (! connection->resuming))
+                         MHD_USE_INTERNAL_POLLING_THREAD)))
                 {
                   /* failed to grow the read buffer, and the
                      client which is supposed to handle the