From 18237fa49c5afc8d53c746c307a35892a665c604 Mon Sep 17 00:00:00 2001
From: Dmitri Tikhonov <dtikhonov@litespeedtech.com>
Date: Mon, 3 Dec 2018 10:34:57 -0500
Subject: [PATCH] Release 1.17.7

[BUGFIX] Do not unset PING alarm before ringing expired alarms.  This
prevented PING from ever being sent.
---
 CHANGELOG                        | 5 +++++
 include/lsquic.h                 | 2 +-
 src/liblsquic/lsquic_full_conn.c | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4592be1e3..732e27747 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2018-12-03
+    - 1.17.7
+    - [BUGFIX] Do not unset PING alarm before ringing expired alarms.
+      This prevented PING from ever being sent.
+
 2018-11-29
     - 1.17.6
     - Add failsafe: resume sending packets after some time
diff --git a/include/lsquic.h b/include/lsquic.h
index faf72c46c..7c1fde5b6 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 1
 #define LSQUIC_MINOR_VERSION 17
-#define LSQUIC_PATCH_VERSION 6
+#define LSQUIC_PATCH_VERSION 7
 
 /**
  * Engine flags:
diff --git a/src/liblsquic/lsquic_full_conn.c b/src/liblsquic/lsquic_full_conn.c
index 50b779f26..e2e83d073 100644
--- a/src/liblsquic/lsquic_full_conn.c
+++ b/src/liblsquic/lsquic_full_conn.c
@@ -2818,12 +2818,6 @@ full_conn_ci_tick (lsquic_conn_t *lconn, lsquic_time_t now)
     lsquic_send_ctl_set_buffer_stream_packets(&conn->fc_send_ctl, 1);
     CLOSE_IF_NECESSARY();
 
-    if (!(conn->fc_flags & FC_SERVER))
-    {
-        lsquic_alarmset_unset(&conn->fc_alset, AL_PING);
-        lsquic_send_ctl_sanity_check(&conn->fc_send_ctl);
-    }
-
     lsquic_alarmset_ring_expired(&conn->fc_alset, now);
     CLOSE_IF_NECESSARY();