Release 2.17.1: fix regression in 2.17.0

litespeedtech · Jun 18, 2020 · e957eb0 · e957eb0
1 parent 4051ae3
commit e957eb0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,5 @@
 2020-06-18
-    - 2.17.0
+    - 2.17.1
     - [FEATURE] QUIC and HTTP/3 Internet Draft 29 support.
     - [BUGFIX] Check that scheduled packets are also sendable when
       calculating a connection's "tickable" property.

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = u'2.17'
 # The full version, including alpha/beta/rc tags
-release = u'2.17.0'
+release = u'2.17.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/include/lsquic.h b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 2
 #define LSQUIC_MINOR_VERSION 17
-#define LSQUIC_PATCH_VERSION 0
+#define LSQUIC_PATCH_VERSION 1
 
 /**
  * Engine flags:

diff --git a/src/liblsquic/lsquic_engine.c b/src/liblsquic/lsquic_engine.c
@@ -1653,8 +1653,11 @@ lsquic_engine_connect (lsquic_engine_t *engine, enum lsquic_version version,
                                  callbacks */
                              )));
     conn->cn_flags |= LSCONN_HASHED;
-    lsquic_mh_insert(&engine->conns_tickable, conn, conn->cn_last_ticked);
-    engine_incref_conn(conn, LSCONN_TICKABLE);
+    if (!(conn->cn_flags & LSCONN_TICKABLE))
+    {
+        lsquic_mh_insert(&engine->conns_tickable, conn, conn->cn_last_ticked);
+        engine_incref_conn(conn, LSCONN_TICKABLE);
+    }
     lsquic_conn_set_ctx(conn, conn_ctx);
     conn->cn_if->ci_client_call_on_new(conn);
   end: