Don't set connection shutdown timeout if deferred signals have changed state

diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c
index d513449a687a11eb679d13710d226f7bc47432fc..a26000308af2f615efd3a976bb2ba1e344aad173 100644 (file)
--- a/src/lib/server/connection.c
+++ b/src/lib/server/connection.c
@@ -759,6 +759,11 @@ static void connection_state_enter_shutdown(connection_t *conn)
        }
        WATCH_POST(conn);
 
+       /*
+        *      If a deferred signal changed the connection state, we're done.
+        */
+       if (conn->pub.state != CONNECTION_STATE_SHUTDOWN) return;
+
        /*
         *      If there's a connection timeout,
         *      set, then add the timer.