fixes

Author: lws-team

lib/core-net/close.c

@@ -654,15 +654,6 @@ __lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason,
 	if (wsi->http.buflist_post_body)
 		lws_buflist_destroy_all_segments(&wsi->http.buflist_post_body);
 #endif
-#if defined(LWS_WITH_UDP)
-	if (wsi->udp) {
-		/* confirm no sul left scheduled in wsi->udp itself */
-		lws_sul_debug_zombies(wsi->a.context, wsi->udp,
-					sizeof(*wsi->udp), "close udp wsi");
-
-		lws_free_set_NULL(wsi->udp);
-	}
-#endif
 
 	if (lws_rops_fidx(wsi->role_ops, LWS_ROPS_close_kill_connection))
 		lws_rops_func_fidx(wsi->role_ops,

lib/roles/http/client/client-http.c

@@ -1211,8 +1211,24 @@ lws_client_interpret_server_handshake(struct lws *wsi)
 			wsi->http.ah->frags[wsi->http.ah->frag_index[_WSI_TOKEN_CLIENT_URI]].offset = wsi->http.ah->pos;
 			wsi->http.ah->frags[wsi->http.ah->frag_index[_WSI_TOKEN_CLIENT_URI]].len = (uint16_t)(pl + 1u);
 
-			if (wsi->stash)
-				wsi->stash->cis[CIS_PATH] = wsi->http.ah->data + wsi->http.ah->pos;
+			if (wsi->stash) {
+				struct client_info_stash *ostash = wsi->stash;
+				const char *cisin[CIS_COUNT];
+				int m;
+
+				wsi->stash = NULL;
+				for (m = 0; m < CIS_COUNT; m++)
+					cisin[m] = ostash->cis[m];
+				cisin[CIS_PATH] = wsi->http.ah->data + wsi->http.ah->pos;
+				
+				if (lws_client_stash_create(wsi, cisin)) {
+					lwsl_err("%s: failed to realloc stash for redirect\n", __func__);
+					lws_free(ostash);
+					cce = "HS: stash realloc failed";
+					goto bail3;
+				}
+				lws_free(ostash);
+			}
 
 			wsi->http.ah->pos += pl + 1u;
 		}

lib/roles/listen/ops-listen.c

@@ -24,6 +24,15 @@
 
 #include <private-lib-core.h>
 
+static void
+lws_accept_pause_cb(lws_sorted_usec_list_t *sul)
+{
+	struct lws *wsi = lws_container_of(sul, struct lws, sul_validity);
+
+	if (lws_change_pollfd(wsi, 0, LWS_POLLIN))
+		lwsl_wsi_info(wsi, "fail");
+}
+
 static lws_handling_result_t
 rops_handle_POLLIN_listen(struct lws_context_per_thread *pt, struct lws *wsi,
 			  struct lws_pollfd *pollfd)
@@ -101,11 +110,33 @@ rops_handle_POLLIN_listen(struct lws_context_per_thread *pt, struct lws *wsi,
 		}
 #endif
 		if (filt.accept_fd == LWS_SOCK_INVALID) {
-			if (LWS_ERRNO == LWS_EAGAIN ||
-			    LWS_ERRNO == LWS_EWOULDBLOCK) {
+			int m = LWS_ERRNO;
+
+			if (m == LWS_EAGAIN ||
+			    m == LWS_EWOULDBLOCK) {
+				break;
+			}
+			lwsl_err("accept: errno %d\n", m);
+
+			if (
+#if defined(WSAEMFILE)
+			    m == WSAEMFILE ||
+#endif
+#if defined(EMFILE)
+			    m == EMFILE ||
+#endif
+#if defined(ENFILE)
+			    m == ENFILE ||
+#endif
+			    0) {
+				if (lws_change_pollfd(wsi, LWS_POLLIN, 0))
+					lwsl_wsi_info(wsi, "failed disable POLLIN");
+
+				lws_sul_schedule(context, 0, &wsi->sul_validity,
+						 lws_accept_pause_cb,
+						 100 * LWS_US_PER_MS);
 				break;
 			}
-			lwsl_err("accept: errno %d\n", LWS_ERRNO);
 
 			return LWS_HPI_RET_HANDLED;
 		}