From 7fc12548509db257366009731a58a085dc6bac49 Mon Sep 17 00:00:00 2001
From: George Wang <gwang@litespeedtech.com>
Date: Tue, 29 Jun 2021 16:11:29 -0400
Subject: [PATCH] Release 3.0.2

---
 CHANGELOG                             | 5 +++++
 docs/conf.py                          | 2 +-
 include/lsquic.h                      | 2 +-
 src/liblsquic/lsquic_full_conn_ietf.c | 5 +++++
 src/liblsquic/lsquic_send_ctl.c       | 5 +++--
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2e1c79c..58e6a1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2021-06-16
+    - 3.0.2
+    - Do not timeout connection if peer sends PING frames.
+    - Do not assert for MTU probe packet when cancel a path.
+
 2021-06-16
     - 3.0.1
     - Only force TICK_CLOSE flag after received CONNECTION_CLOSE frame. (issue #292 #281)
diff --git a/docs/conf.py b/docs/conf.py
index 62844c5..c25e1e4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ author = u'LiteSpeed Technologies'
 # The short X.Y version
 version = u'3.0'
 # The full version, including alpha/beta/rc tags
-release = u'3.0.1'
+release = u'3.0.2'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/lsquic.h b/include/lsquic.h
index cf41c5a..efb0bb7 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 3
 #define LSQUIC_MINOR_VERSION 0
-#define LSQUIC_PATCH_VERSION 1
+#define LSQUIC_PATCH_VERSION 2
 
 /**
  * Engine flags:
diff --git a/src/liblsquic/lsquic_full_conn_ietf.c b/src/liblsquic/lsquic_full_conn_ietf.c
index 952d676..87e9cc7 100644
--- a/src/liblsquic/lsquic_full_conn_ietf.c
+++ b/src/liblsquic/lsquic_full_conn_ietf.c
@@ -5918,6 +5918,11 @@ process_ping_frame (struct ietf_full_conn *conn,
     LSQ_DEBUG("received PING");
     if (conn->ifc_flags & IFC_SERVER)
         log_conn_flow_control(conn);
+
+    LSQ_DEBUG("received PING frame, update last progress to %"PRIu64,
+                                            conn->ifc_pub.last_tick);
+    conn->ifc_pub.last_prog = conn->ifc_pub.last_tick;
+
     return 1;
 }
 
diff --git a/src/liblsquic/lsquic_send_ctl.c b/src/liblsquic/lsquic_send_ctl.c
index 78b4dd7..b99b5af 100644
--- a/src/liblsquic/lsquic_send_ctl.c
+++ b/src/liblsquic/lsquic_send_ctl.c
@@ -3654,8 +3654,9 @@ lsquic_send_ctl_cancel_path_verification (struct lsquic_send_ctl *ctl,
         next = TAILQ_NEXT(packet_out, po_next);
         if (packet_out->po_path == path)
         {
-            assert(packet_out->po_frame_types
-                    & (QUIC_FTBIT_PATH_CHALLENGE|QUIC_FTBIT_PATH_RESPONSE));
+            assert((packet_out->po_frame_types
+                    & (QUIC_FTBIT_PATH_CHALLENGE|QUIC_FTBIT_PATH_RESPONSE))
+                   || packet_out->po_frame_types == QUIC_FTBIT_PADDING);
             assert(!(packet_out->po_frame_types & ctl->sc_retx_frames));
             send_ctl_maybe_renumber_sched_to_right(ctl, packet_out);
             send_ctl_sched_remove(ctl, packet_out);