1.11.1: [BUGFIX] Fix STOP_WAITING frame processing in the new Q044 code

litespeedtech · Aug 16, 2018 · de1c35d · de1c35d
1 parent 9626cfc
commit de1c35d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)