From de1c35ddafa0106be0e467db4e39515f9dc6b838 Mon Sep 17 00:00:00 2001
From: Dmitri Tikhonov <dtikhonov@litespeedtech.com>
Date: Thu, 16 Aug 2018 17:00:25 -0400
Subject: [PATCH] 1.11.1: [BUGFIX] Fix STOP_WAITING frame processing in the new
 Q044 code

---
 CHANGELOG                        | 5 +++++
 include/lsquic.h                 | 2 +-
 src/liblsquic/lshpack.c          | 2 +-
 src/liblsquic/lsquic_packet_in.h | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0f31aba68..d871b92f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2018-08-16
+
+    - 1.11.1
+    - [BUGFIX] Fix STOP_WAITING frame processing in the new Q044 code
+
 2018-08-15
 
     - 1.11.0
diff --git a/include/lsquic.h b/include/lsquic.h
index c44a39e82..f309b268c 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 1
 #define LSQUIC_MINOR_VERSION 11
-#define LSQUIC_PATCH_VERSION 0
+#define LSQUIC_PATCH_VERSION 1
 
 /**
  * Engine flags:
diff --git a/src/liblsquic/lshpack.c b/src/liblsquic/lshpack.c
index d61e0e654..cafc502dc 100644
--- a/src/liblsquic/lshpack.c
+++ b/src/liblsquic/lshpack.c
@@ -36,7 +36,7 @@ SOFTWARE.
 #if LS_HPACK_EMIT_TEST_CODE
 #include "lshpack-test.h"
 #endif
-#include XXH_HEADER_NAME
+#include "lsquic_xxhash.h"
 
 #define HPACK_STATIC_TABLE_SIZE   61
 #define INITIAL_DYNAMIC_TABLE_SIZE  4096
diff --git a/src/liblsquic/lsquic_packet_in.h b/src/liblsquic/lsquic_packet_in.h
index 1c5ca74d5..693a96c23 100644
--- a/src/liblsquic/lsquic_packet_in.h
+++ b/src/liblsquic/lsquic_packet_in.h
@@ -83,7 +83,8 @@ typedef struct lsquic_packet_in
 #define lsquic_packet_in_packno_bits(p) \
     (((p)->pi_flags & PI_GQUIC) ? \
                     ((lsquic_packet_in_public_flags(p) >> 4) & 3) : \
-                    ((p)->pi_data[0] & 3))
+                    ((p)->pi_header_type == HETY_NOT_SET ? \
+                    ((p)->pi_data[0] & 3) : PACKNO_LEN_4))
 
 #define lsquic_packet_in_upref(p) (++(p)->pi_refcnt)