From 0aa00f23690f77883eca588a29ef0cbfc7def38e Mon Sep 17 00:00:00 2001
From: George Wang <gwang@litespeedtech.com>
Date: Fri, 19 Aug 2022 11:21:44 -0400
Subject: [PATCH] Release 3.1.3

---
 bin/duck_client.c | 2 ++
 bin/duck_server.c | 1 +
 bin/echo_client.c | 2 ++
 bin/echo_server.c | 2 ++
 bin/http_client.c | 2 ++
 bin/http_server.c | 1 +
 bin/md5_client.c  | 2 ++
 bin/md5_server.c  | 2 ++
 bin/perf_client.c | 1 +
 9 files changed, 15 insertions(+)

diff --git a/bin/duck_client.c b/bin/duck_client.c
index 30484e4..3e12ac9 100644
--- a/bin/duck_client.c
+++ b/bin/duck_client.c
@@ -62,6 +62,8 @@ duck_client_on_conn_closed (lsquic_conn_t *conn)
     lsquic_conn_ctx_t *ctx = lsquic_conn_get_ctx(conn);
     LSQ_NOTICE("Connection closed, stop client");
     prog_stop((struct prog *) ctx);
+
+    lsquic_conn_set_ctx(conn, NULL);
 }
 
 
diff --git a/bin/duck_server.c b/bin/duck_server.c
index 543b9f1..7f7da80 100644
--- a/bin/duck_server.c
+++ b/bin/duck_server.c
@@ -40,6 +40,7 @@ static void
 duck_server_on_conn_closed (lsquic_conn_t *conn)
 {
     LSQ_NOTICE("siduck connection closed");
+    lsquic_conn_set_ctx(conn, NULL);
 }
 
 
diff --git a/bin/echo_client.c b/bin/echo_client.c
index a0e7fff..3fb42f3 100644
--- a/bin/echo_client.c
+++ b/bin/echo_client.c
@@ -65,6 +65,8 @@ echo_client_on_conn_closed (lsquic_conn_t *conn)
     lsquic_conn_ctx_t *conn_h = lsquic_conn_get_ctx(conn);
     LSQ_NOTICE("Connection closed");
     prog_stop(conn_h->client_ctx->prog);
+
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
diff --git a/bin/echo_server.c b/bin/echo_server.c
index 73e10fd..442ce8d 100644
--- a/bin/echo_server.c
+++ b/bin/echo_server.c
@@ -72,6 +72,8 @@ echo_server_on_conn_closed (lsquic_conn_t *conn)
     else
         LSQ_NOTICE("Connection closed");
     TAILQ_REMOVE(&conn_h->server_ctx->conn_ctxs, conn_h, next_connh);
+
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
diff --git a/bin/http_client.c b/bin/http_client.c
index 33f638b..3a38a84 100644
--- a/bin/http_client.c
+++ b/bin/http_client.c
@@ -373,6 +373,7 @@ http_client_on_conn_closed (lsquic_conn_t *conn)
     }
     event_active(cacos->event, 0, 0);
 
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
@@ -1328,6 +1329,7 @@ qif_client_on_conn_closed (lsquic_conn_t *conn)
     struct http_client_ctx *client_ctx = (void *) lsquic_conn_get_ctx(conn);
     LSQ_INFO("connection is closed: stop engine");
     prog_stop(client_ctx->prog);
+    lsquic_conn_set_ctx(conn, NULL);
 }
 
 
diff --git a/bin/http_server.c b/bin/http_server.c
index c5b2caf..80d5153 100644
--- a/bin/http_server.c
+++ b/bin/http_server.c
@@ -375,6 +375,7 @@ http_server_on_conn_closed (lsquic_conn_t *conn)
         }
     }
     /* No provision is made to stop HTTP server */
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
diff --git a/bin/md5_client.c b/bin/md5_client.c
index 926b721..0fff7ed 100644
--- a/bin/md5_client.c
+++ b/bin/md5_client.c
@@ -110,6 +110,8 @@ client_on_conn_closed (lsquic_conn_t *conn)
     lsquic_conn_ctx_t *conn_h = lsquic_conn_get_ctx(conn);
     LSQ_NOTICE("Connection closed");
     prog_stop(conn_h->client_ctx->prog);
+
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
diff --git a/bin/md5_server.c b/bin/md5_server.c
index c5acd3a..d47ccbf 100644
--- a/bin/md5_server.c
+++ b/bin/md5_server.c
@@ -95,6 +95,8 @@ server_on_conn_closed (lsquic_conn_t *conn)
     else
         LSQ_NOTICE("Connection closed");
     TAILQ_REMOVE(&conn_h->server_ctx->conn_ctxs, conn_h, next_connh);
+
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_h);
 }
 
diff --git a/bin/perf_client.c b/bin/perf_client.c
index f9cf291..8ab971b 100644
--- a/bin/perf_client.c
+++ b/bin/perf_client.c
@@ -105,6 +105,7 @@ perf_client_on_conn_closed (struct lsquic_conn *conn)
 
     LSQ_NOTICE("Connection closed");
     conn_ctx = lsquic_conn_get_ctx(conn);
+    lsquic_conn_set_ctx(conn, NULL);
     free(conn_ctx);
     --s_n_conns;
     if (0 == s_n_conns)