From: Andy Green <andy.green@linaro.org>
Date: Mon, 29 Feb 2016 03:11:48 +0000 (+0800)
Subject: libuv when in use skip shutdown close phase
X-Git-Tag: upstream/1.7.3~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=980ca50c3936cb8ac03fba03529067d2fff40033;p=platform%2Fupstream%2Flibwebsockets.git

libuv when in use skip shutdown close phase

Signed-off-by: Andy Green <andy.green@linaro.org>
---

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 68edfd9..db855d2 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -308,11 +308,15 @@ just_kill_connection:
 		if (n)
 			lwsl_debug("closing: shutdown ret %d\n", LWS_ERRNO);
 
-		lws_change_pollfd(wsi, LWS_POLLOUT, LWS_POLLIN);
-		wsi->state = LWSS_SHUTDOWN;
-		lws_set_timeout(wsi, PENDING_TIMEOUT_SHUTDOWN_FLUSH,
-				context->timeout_secs);
-		return;
+		/* libuv: no event available to guarantee completion */
+		if (!LWS_LIBUV_ENABLED(context)) {
+
+			lws_change_pollfd(wsi, LWS_POLLOUT, LWS_POLLIN);
+			wsi->state = LWSS_SHUTDOWN;
+			lws_set_timeout(wsi, PENDING_TIMEOUT_SHUTDOWN_FLUSH,
+					context->timeout_secs);
+			return;
+		}
 	}
 #endif