From a49a76209681c8bd34b57862f8be0207b3f3a114 Mon Sep 17 00:00:00 2001 From: Razvan Crainea Date: Wed, 5 Apr 2017 17:16:40 +0300 Subject: [PATCH] Supress errors when gracefully timing out Thanks Chris Maciejewski for reporting and providing testing environment (cherry picked from commit 87e42b38fc8def1f3202b8036c4aa560ea69bee9) --- modules/proto_ws/proto_ws.c | 4 +++- modules/proto_wss/proto_wss.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/proto_ws/proto_ws.c b/modules/proto_ws/proto_ws.c index bfe766ee0e4..63bd0394c01 100644 --- a/modules/proto_ws/proto_ws.c +++ b/modules/proto_ws/proto_ws.c @@ -79,6 +79,8 @@ static str trace_destination_name = {NULL, 0}; trace_dest t_dst; trace_proto_t tprot; +extern int is_tcp_main; + /* module tracing parameters */ static int trace_is_on_tmp=1, *trace_is_on; static char* trace_filter_route; @@ -252,7 +254,7 @@ static void ws_conn_clean(struct tcp_connection* c) if (!d) return; - if (c->state == S_CONN_OK) { + if (c->state == S_CONN_OK && !is_tcp_main) { switch (d->code) { case WS_ERR_NOSEND: break; diff --git a/modules/proto_wss/proto_wss.c b/modules/proto_wss/proto_wss.c index d61d5000f59..ed676f3a385 100644 --- a/modules/proto_wss/proto_wss.c +++ b/modules/proto_wss/proto_wss.c @@ -90,6 +90,8 @@ static str trace_destination_name = {NULL, 0}; trace_dest t_dst; trace_proto_t tprot; +extern int is_tcp_main; + /* module tracing parameters */ static int trace_is_on_tmp=1, *trace_is_on; static char* trace_filter_route; @@ -278,7 +280,7 @@ static void ws_conn_clean(struct tcp_connection* c) if (!d) return; - if (c->state == S_CONN_OK) { + if (c->state == S_CONN_OK && !is_tcp_main) { switch (d->code) { case WS_ERR_NOSEND: break;