From 6f66d794e8d24c0f03579c2d9b1b4ac2abc7903b Mon Sep 17 00:00:00 2001 From: Sergey Lyubka <valenok@gmail.com> Date: Fri, 20 Jun 2014 11:41:13 +0100 Subject: [PATCH] Refactor NS_POLL case in mg_ev_handler --- mongoose.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mongoose.c b/mongoose.c index 406ce19db..fb4678431 100644 --- a/mongoose.c +++ b/mongoose.c @@ -4945,15 +4945,17 @@ static void mg_ev_handler(struct ns_connection *nc, enum ns_event ev, void *p) { break; case NS_POLL: - if (call_user(conn, MG_POLL) == MG_TRUE) { - if (conn->ns_conn->flags & MG_HEADERS_SENT) { - write_terminating_chunk(conn); + if (conn != NULL) { + if (call_user(conn, MG_POLL) == MG_TRUE) { + if (conn->ns_conn->flags & MG_HEADERS_SENT) { + write_terminating_chunk(conn); + } + close_local_endpoint(conn); } - close_local_endpoint(conn); - } - if (conn != NULL && conn->endpoint_type == EP_FILE) { - transfer_file_data(conn); + if (conn->endpoint_type == EP_FILE) { + transfer_file_data(conn); + } } // Expire idle connections -- GitLab