timeout also fixup for0middle guy deletion case

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

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 23eba4d..22c8c06 100644 (file)
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -75,7 +75,10 @@ lws_remove_from_timeout_list(struct lws *wsi)
        if (!wsi->timeout_list_prev)
                return;
 
        if (!wsi->timeout_list_prev)
                return;
 

+       if (wsi->timeout_list)
+               wsi->timeout_list->timeout_list_prev = wsi->timeout_list_prev;

        *wsi->timeout_list_prev = wsi->timeout_list;
        *wsi->timeout_list_prev = wsi->timeout_list;

+

        wsi->timeout_list_prev = NULL;
        wsi->timeout_list = NULL;
 }
        wsi->timeout_list_prev = NULL;
        wsi->timeout_list = NULL;
 }

diff --git a/test-server/fuzxy.c b/test-server/fuzxy.c
index 8c77df9..4fd292c 100644 (file)
--- a/test-server/fuzxy.c
+++ b/test-server/fuzxy.c
@@ -277,8 +277,8 @@ struct fuzxy_rule {
 };
 
 struct fuzxy_rule r = {
 };
 
 struct fuzxy_rule r = {

-               { "Host:", "\x0d", "\xe0\x00\x0d" },
-               { 5, 1, 3 },
+               { "G", "E", "\xe0\x41\x42" },
+               { 1, 1, 3 },

                65536
 };
 
                65536
 };