pipe: close path in libuv

Author: lws-team

lib/core-net/close.c

@@ -474,8 +474,6 @@ __lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason,
 			delete_from_fdwsi(wsi->a.context, wsi);
 #endif
 		}
-		lws_plat_pipe_close(pt->pipe_wsi);
-		pt->pipe_wsi = NULL;
 	}
 
 #if defined(LWS_WITH_SYS_METRICS) && \
@@ -1056,13 +1054,14 @@ __lws_close_free_wsi_final(struct lws *wsi)
 	}
 
 	/* ... if we're closing the cancel pipe, account for it */
-
 	{
 		struct lws_context_per_thread *pt =
 				&wsi->a.context->pt[(int)wsi->tsi];
 
-		if (pt->pipe_wsi == wsi)
+		if (pt->pipe_wsi == wsi) {
+			lws_plat_pipe_close(wsi);
 			pt->pipe_wsi = NULL;
+		}
 		if (pt->dummy_pipe_fds[0] == wsi->desc.sockfd)
                {
 #if !defined(LWS_PLAT_FREERTOS)

lib/event-libs/libuv/libuv.c

@@ -524,6 +524,7 @@ elops_accept_uv(struct lws *wsi)
 	if (n) {
 		lwsl_wsi_err(wsi, "uv_poll_init failed %d, sockfd=%p", n,
 				  (void *)(lws_intptr_t)wsi->desc.sockfd);
+		assert(n != UV_EEXIST);
 		lws_free(w_read->pwatcher);
 		w_read->pwatcher = NULL;
 		return -1;
@@ -633,7 +634,7 @@ elops_init_vhost_listen_wsi_uv(struct lws *wsi)
 	if (n) {
 		lwsl_wsi_err(wsi, "uv_poll_init failed %d, sockfd=%p", n,
 				  (void *)(lws_intptr_t)wsi->desc.sockfd);
-
+		assert(n != UV_EEXIST);
 		return -1;
 	}
 
@@ -945,6 +946,7 @@ elops_sock_accept_parallel_uv(struct lws *wsi, lws_sockfd_type fd, int pidx)
 
 	if (n) {
 		lwsl_wsi_err(wsi, "uv_poll_init failed %d", n);
+		assert(n != UV_EEXIST);
 		lws_free(w_read->pwatcher);
 		w_read->pwatcher = NULL;
 		return -1;