nodejs
diff --git a/‎deps/ngtcp2/nghttp3/lib/includes/nghttp3/nghttp3.h‎
Lines changed: 88 additions & 0 deletions b/‎deps/ngtcp2/nghttp3/lib/includes/nghttp3/nghttp3.h‎
Lines changed: 88 additions & 0 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h‎
Lines changed: 2 additions & 2 deletions b/‎deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_conn.c‎
Lines changed: 22 additions & 0 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_conn.c‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_conv.c‎
Lines changed: 9 additions & 0 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_conv.c‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_conv.h‎
Lines changed: 0 additions & 40 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_conv.h‎
Lines changed: 0 additions & 40 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_http.c‎
Lines changed: 3 additions & 6 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_http.c‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_qpack_huffman.c‎
Lines changed: 4 additions & 4 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_qpack_huffman.c‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎deps/ngtcp2/nghttp3/lib/nghttp3_qpack_huffman.h‎
Lines changed: 12 additions & 13 deletions b/‎deps/ngtcp2/nghttp3/lib/nghttp3_qpack_huffman.h‎
Lines changed: 12 additions & 13 deletions
@@ -2625,6 +2625,25 @@ NGHTTP3_EXTERN nghttp3_ssize nghttp3_conn_writev_stream(nghttp3_conn *conn,
 NGHTTP3_EXTERN int nghttp3_conn_add_write_offset(nghttp3_conn *conn,
                                                  int64_t stream_id, size_t n);
 
+/**
+ * @function
+ *
+ * `nghttp3_conn_is_stream_flushed` returns nonzero if all stream data
+ * for a stream identified by |stream_id| so far have been accepted by
+ * QUIC stack.  This means that the cumulative number of bytes that
+ * `nghttp3_conn_add_write_offset` notified covers all stream data
+ * currently held.  This does not mean more stream data cannot be
+ * submitted to this stream via :type:`nghttp3_read_data_callback` and
+ * all stream data have been acknowledged.
+ *
+ * If there is no stream identified by |stream_id|, this function
+ * returns nonzero.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN int nghttp3_conn_is_stream_flushed(const nghttp3_conn *conn,
+                                                  int64_t stream_id);
+
 /**
  * @function
  *
@@ -3418,6 +3437,75 @@ NGHTTP3_EXTERN const nghttp3_info *nghttp3_version(int least_version);
  */
 NGHTTP3_EXTERN int nghttp3_err_is_fatal(int liberr);
 
+/**
+ * @function
+ *
+ * `nghttp3_get_uvarint` reads variable-length unsigned integer from
+ * the buffer pointed by |p|, and stores it in the object pointed by
+ * |dest| in host byte order.  It returns |p| plus the number of bytes
+ * read from |p|.  This function assumes that |p| points to the buffer
+ * that contains a valid variable-length unsigned integer.  Use
+ * `nghttp3_get_uvarintlen` to get the number of bytes to successfully
+ * decode an integer.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN const uint8_t *nghttp3_get_uvarint(uint64_t *dest,
+                                                  const uint8_t *p);
+
+/**
+ * @function
+ *
+ * `nghttp3_get_uvarintlen` returns the required number of bytes to
+ * read variable-length unsigned integer starting at |p|.  |p| must
+ * not be NULL.  This function only reads the single byte from the
+ * buffer pointed by |p|, and determines the number of bytes to read.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN size_t nghttp3_get_uvarintlen(const uint8_t *p);
+
+/**
+ * @function
+ *
+ * `nghttp3_get_varint` reads variable-length unsigned integer from
+ * the buffer pointed by |p|, and stores it in the object pointed by
+ * |dest| in host byte order.  It returns |p| plus the number of bytes
+ * read from |p|.  This function assumes that |p| points to the buffer
+ * that contains a valid variable-length unsigned integer.  Use
+ * `nghttp3_get_uvarintlen` to get the number of bytes to successfully
+ * decode an integer.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN const uint8_t *nghttp3_get_varint(int64_t *dest,
+                                                 const uint8_t *p);
+
+/**
+ * @function
+ *
+ * `nghttp3_put_uvarint` writes |n| to the buffer pointed by |p| using
+ * variable-length unsigned integer encoding.  It returns the one
+ * beyond of the last written position.  This function assumes that
+ * the buffer pointed by |p| has sufficient capacity to encode |n|.
+ * To know the required capacity, use `nghttp3_put_uvarintlen`.  |n|
+ * must be less than or equal to (1 << 62) - 1.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN uint8_t *nghttp3_put_uvarint(uint8_t *p, uint64_t n);
+
+/**
+ * @function
+ *
+ * `nghttp3_put_uvarintlen` returns the required number of bytes to
+ * encode |n| in variable-length unsigned integer encoding.  |n| must
+ * be less than or equal to (1 << 62) - 1.
+ *
+ * .. version-added:: 1.17.0
+ */
+NGHTTP3_EXTERN size_t nghttp3_put_uvarintlen(uint64_t n);
+
 /*
  * Versioned function wrappers
  */
 
@@ -31,7 +31,7 @@
  *
  * Version number of the nghttp3 library release.
  */
-#define NGHTTP3_VERSION "1.16.0"
+#define NGHTTP3_VERSION "1.17.0"
 
 /**
  * @macro
@@ -41,6 +41,6 @@
  * number, 8 bits for minor and 8 bits for patch. Version 1.2.3
  * becomes 0x010203.
  */
-#define NGHTTP3_VERSION_NUM 0x011000
+#define NGHTTP3_VERSION_NUM 0x011100
 
 #endif /* !defined(NGHTTP3_VERSION_H) */
@@ -2979,3 +2979,25 @@ int nghttp3_conn_is_drained2(const nghttp3_conn *conn) {
          nghttp3_stream_outq_write_done(conn->tx.ctrl) &&
          nghttp3_ringbuf_len(&conn->tx.ctrl->frq) == 0;
 }
+
+int nghttp3_conn_is_stream_flushed(const nghttp3_conn *conn,
+                                   int64_t stream_id) {
+  nghttp3_stream *stream = nghttp3_conn_find_stream(conn, stream_id);
+  const nghttp3_frame *fr;
+
+  if (!stream) {
+    return 1;
+  }
+
+  if (!nghttp3_stream_outq_write_done(stream)) {
+    return 0;
+  }
+
+  if (nghttp3_ringbuf_len(&stream->frq) == 0) {
+    return 1;
+  }
+
+  fr = nghttp3_ringbuf_get(&stream->frq, 0);
+
+  return fr->hd.type == NGHTTP3_FRAME_DATA;
+}
@@ -70,6 +70,15 @@ size_t nghttp3_get_uvarintlen(const uint8_t *p) {
   return (size_t)(1U << (*p >> 6));
 }
 
+const uint8_t *nghttp3_get_varint(int64_t *dest, const uint8_t *p) {
+  uint64_t n;
+
+  p = nghttp3_get_uvarint(&n, p);
+  *dest = (int64_t)n;
+
+  return p;
+}
+
 uint8_t *nghttp3_put_uint64be(uint8_t *p, uint64_t n) {
   n = nghttp3_htonl64(n);
   return nghttp3_cpymem(p, (const uint8_t *)&n, sizeof(n));
 
@@ -92,34 +92,6 @@
 #  define ntohs(N) _byteswap_ushort(N)
 #endif /* defined(WIN32) */
 
-/*
- * nghttp3_get_uvarint reads variable-length unsigned integer from
- * |p|, and stores it in the buffer pointed by |dest| in host byte
- * order.  It returns |p| plus the number of bytes read from |p|.
- */
-const uint8_t *nghttp3_get_uvarint(uint64_t *dest, const uint8_t *p);
-
-/*
- * nghttp3_get_uvarintlen returns the required number of bytes to read
- * variable-length integer starting at |p|.
- */
-size_t nghttp3_get_uvarintlen(const uint8_t *p);
-
-/*
- * nghttp3_get_varint reads variable-length unsigned integer from |p|,
- * and stores it in the buffer pointed by |dest| in host byte order.
- * It returns |p| plus the number of bytes read from |p|.
- */
-static inline const uint8_t *nghttp3_get_varint(int64_t *dest,
-                                                const uint8_t *p) {
-  uint64_t n;
-
-  p = nghttp3_get_uvarint(&n, p);
-  *dest = (int64_t)n;
-
-  return p;
-}
-
 /*
  * nghttp3_put_uint64be writes |n| in host byte order in |p| in
  * network byte order.  It returns the one beyond of the last written
@@ -141,18 +113,6 @@ uint8_t *nghttp3_put_uint32be(uint8_t *p, uint32_t n);
  */
 uint8_t *nghttp3_put_uint16be(uint8_t *p, uint16_t n);
 
-/*
- * nghttp3_put_uvarint writes |n| in |p| using variable-length integer
- * encoding.  It returns the one beyond of the last written position.
- */
-uint8_t *nghttp3_put_uvarint(uint8_t *p, uint64_t n);
-
-/*
- * nghttp3_put_uvarintlen returns the required number of bytes to
- * encode |n|.
- */
-size_t nghttp3_put_uvarintlen(uint64_t n);
-
 /*
  * nghttp3_ord_stream_id returns the ordinal number of |stream_id|.
  */
 
@@ -36,12 +36,9 @@
 #include "nghttp3_macro.h"
 #include "nghttp3_conv.h"
 #include "nghttp3_unreachable.h"
+#include "nghttp3_str.h"
 #include "sfparse/sfparse.h"
 
-static uint8_t downcase(uint8_t c) {
-  return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
-}
-
 /*
  * memieq returns 1 if the data pointed by |a| of length |n| equals to
  * |b| of the same length in case-insensitive manner.  The data
@@ -52,7 +49,7 @@ static int memieq(const void *a, const void *b, size_t n) {
   const uint8_t *aa = a, *bb = b;
 
   for (i = 0; i < n; ++i) {
-    if (aa[i] != downcase(bb[i])) {
+    if (aa[i] != nghttp3_downcase_byte(bb[i])) {
       return 0;
     }
   }
@@ -704,7 +701,7 @@ int nghttp3_check_header_name(const uint8_t *name, size_t len) {
     --len;
   }
   for (last = name + len; name != last; ++name) {
-    if (!VALID_HD_NAME_CHARS[*name]) {
+    if (VALID_HD_NAME_CHARS[*name] != 1) {
       return 0;
     }
   }
 
@@ -80,7 +80,7 @@ uint8_t *nghttp3_qpack_huffman_encode(uint8_t *dest, const uint8_t *src,
 void nghttp3_qpack_huffman_decode_context_init(
   nghttp3_qpack_huffman_decode_context *ctx) {
   *ctx = (nghttp3_qpack_huffman_decode_context){
-    .flags = NGHTTP3_QPACK_HUFFMAN_ACCEPTED,
+    .flags = NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED,
   };
 }
 
@@ -103,20 +103,20 @@ nghttp3_qpack_huffman_decode(nghttp3_qpack_huffman_decode_context *ctx,
   for (; src != end;) {
     c = *src++;
     t = qpack_huffman_decode_table[t.fstate][c >> 4];
-    if (t.flags & NGHTTP3_QPACK_HUFFMAN_SYM) {
+    if (t.flags & NGHTTP3_QPACK_HUFFMAN_FLAG_SYM) {
       *p++ = t.sym;
     }
 
     t = qpack_huffman_decode_table[t.fstate][c & 0xFU];
-    if (t.flags & NGHTTP3_QPACK_HUFFMAN_SYM) {
+    if (t.flags & NGHTTP3_QPACK_HUFFMAN_FLAG_SYM) {
       *p++ = t.sym;
     }
   }
 
   ctx->fstate = t.fstate;
   ctx->flags = t.flags;
 
-  if (fin && !(ctx->flags & NGHTTP3_QPACK_HUFFMAN_ACCEPTED)) {
+  if (fin && !(ctx->flags & NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED)) {
     return NGHTTP3_ERR_QPACK_FATAL;
   }
 
 
@@ -46,25 +46,24 @@ size_t nghttp3_qpack_huffman_encode_count(const uint8_t *src, size_t len);
 uint8_t *nghttp3_qpack_huffman_encode(uint8_t *dest, const uint8_t *src,
                                       size_t srclen);
 
-typedef enum nghttp3_qpack_huffman_decode_flag {
-  /* FSA accepts this state as the end of huffman encoding
-     sequence. */
-  NGHTTP3_QPACK_HUFFMAN_ACCEPTED = 1,
-  /* This state emits symbol */
-  NGHTTP3_QPACK_HUFFMAN_SYM = 1 << 1,
-} nghttp3_qpack_huffman_decode_flag;
+/* NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED indicates that FSA accepts this
+   state as the end of huffman encoding sequence. */
+#define NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED 0x01U
+/* NGHTTP3_QPACK_HUFFMAN_FLAG_SYM indicates that this state emits
+   symbol */
+#define NGHTTP3_QPACK_HUFFMAN_FLAG_SYM 0x02U
 
 typedef struct nghttp3_qpack_huffman_decode_node {
   /* fstate is the current huffman decoding state, which is actually
      the node ID of internal huffman tree with
-     nghttp3_qpack_huffman_decode_flag OR-ed.  We have 257 leaf nodes,
-     but they are identical to root node other than emitting a symbol,
-     so we have 256 internal nodes [1..256], inclusive.  The node ID
-     256 is a special node and it is a terminal state that means
-     decoding failed. */
+     NGHTTP3_QPACK_HUFFMAN_FLAG_* flags OR-ed.  We have 257 leaf
+     nodes, but they are identical to root node other than emitting a
+     symbol, so we have 256 internal nodes [1..256], inclusive.  The
+     node ID 256 is a special node and it is a terminal state that
+     means decoding failed. */
   uint16_t fstate;
   uint8_t flags;
-  /* symbol if NGHTTP3_QPACK_HUFFMAN_SYM flag set */
+  /* symbol if NGHTTP3_QPACK_HUFFMAN_FLAG_SYM flag set */
   uint8_t sym;
 } nghttp3_qpack_huffman_decode_node;
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,9 @@`
`36`	`36`	`#include "nghttp3_macro.h"`
`37`	`37`	`#include "nghttp3_conv.h"`
`38`	`38`	`#include "nghttp3_unreachable.h"`
	`39`	`+#include "nghttp3_str.h"`
`39`	`40`	`#include "sfparse/sfparse.h"`
`40`	`41`
`41`		`-static uint8_t downcase(uint8_t c) {`
`42`		`- return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;`
`43`		`-}`
`44`		`-`
`45`	`42`	`/*`
`46`	`43`	`* memieq returns 1 if the data pointed by \|a\| of length \|n\| equals to`
`47`	`44`	`* \|b\| of the same length in case-insensitive manner. The data`
`@@ -52,7 +49,7 @@ static int memieq(const void a, const void b, size_t n) {`
`52`	`49`	`const uint8_t aa = a, bb = b;`
`53`	`50`
`54`	`51`	`for (i = 0; i < n; ++i) {`
`55`		`- if (aa[i] != downcase(bb[i])) {`
	`52`	`+ if (aa[i] != nghttp3_downcase_byte(bb[i])) {`
`56`	`53`	`return 0;`
`57`	`54`	`}`
`58`	`55`	`}`
`@@ -704,7 +701,7 @@ int nghttp3_check_header_name(const uint8_t *name, size_t len) {`
`704`	`701`	`--len;`
`705`	`702`	`}`
`706`	`703`	`for (last = name + len; name != last; ++name) {`
`707`		`- if (!VALID_HD_NAME_CHARS[*name]) {`
	`704`	`+ if (VALID_HD_NAME_CHARS[*name] != 1) {`
`708`	`705`	`return 0;`
`709`	`706`	`}`
`710`	`707`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ uint8_t nghttp3_qpack_huffman_encode(uint8_t dest, const uint8_t *src,`
`80`	`80`	`void nghttp3_qpack_huffman_decode_context_init(`
`81`	`81`	`nghttp3_qpack_huffman_decode_context *ctx) {`
`82`	`82`	`*ctx = (nghttp3_qpack_huffman_decode_context){`
`83`		`- .flags = NGHTTP3_QPACK_HUFFMAN_ACCEPTED,`
	`83`	`+ .flags = NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED,`
`84`	`84`	`};`
`85`	`85`	`}`
`86`	`86`
`@@ -103,20 +103,20 @@ nghttp3_qpack_huffman_decode(nghttp3_qpack_huffman_decode_context *ctx,`
`103`	`103`	`for (; src != end;) {`
`104`	`104`	`c = *src++;`
`105`	`105`	`t = qpack_huffman_decode_table[t.fstate][c >> 4];`
`106`		`- if (t.flags & NGHTTP3_QPACK_HUFFMAN_SYM) {`
	`106`	`+ if (t.flags & NGHTTP3_QPACK_HUFFMAN_FLAG_SYM) {`
`107`	`107`	`*p++ = t.sym;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`t = qpack_huffman_decode_table[t.fstate][c & 0xFU];`
`111`		`- if (t.flags & NGHTTP3_QPACK_HUFFMAN_SYM) {`
	`111`	`+ if (t.flags & NGHTTP3_QPACK_HUFFMAN_FLAG_SYM) {`
`112`	`112`	`*p++ = t.sym;`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`ctx->fstate = t.fstate;`
`117`	`117`	`ctx->flags = t.flags;`
`118`	`118`
`119`		`- if (fin && !(ctx->flags & NGHTTP3_QPACK_HUFFMAN_ACCEPTED)) {`
	`119`	`+ if (fin && !(ctx->flags & NGHTTP3_QPACK_HUFFMAN_FLAG_ACCEPTED)) {`
`120`	`120`	`return NGHTTP3_ERR_QPACK_FATAL;`
`121`	`121`	`}`
`122`	`122`