deps: update nghttp2 to 1.39.1

gengjiawen · targos · commit 9f47242e19a0 · 2019-07-22T21:20:43.000+02:00
PR-URL: #28448 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
@@ -29,14 +29,14 @@
  * @macro
  * Version number of the nghttp2 library release
  */
-#define NGHTTP2_VERSION "1.38.0"
+#define NGHTTP2_VERSION "1.39.1"
 
 /**
  * @macro
  * Numerical representation of the version number of the nghttp2 library
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define NGHTTP2_VERSION_NUM 0x012600
+#define NGHTTP2_VERSION_NUM 0x012701
 
 #endif /* NGHTTP2VER_H */
diff --git a/deps/nghttp2/lib/nghttp2_http.c b/deps/nghttp2/lib/nghttp2_http.c
@@ -263,11 +263,14 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
       stream->content_length = 0;
       return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
     }
-    if (stream->status_code / 100 == 1 ||
-        (stream->status_code / 100 == 2 &&
-         (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT))) {
+    if (stream->status_code / 100 == 1) {
       return NGHTTP2_ERR_HTTP_HEADER;
     }
+    /* https://tools.ietf.org/html/rfc7230#section-3.3.3 */
+    if (stream->status_code / 100 == 2 &&
+        (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT)) {
+      return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
+    }
     if (stream->content_length != -1) {
       return NGHTTP2_ERR_HTTP_HEADER;
     }

Original file line number	Diff line number	Diff line change
`@@ -263,11 +263,14 @@ static int http_response_on_header(nghttp2_stream stream, nghttp2_hd_nv nv,`
`263`	`263`	`stream->content_length = 0;`
`264`	`264`	`return NGHTTP2_ERR_REMOVE_HTTP_HEADER;`
`265`	`265`	`}`
`266`		`- if (stream->status_code / 100 == 1 \|\|`
`267`		`- (stream->status_code / 100 == 2 &&`
`268`		`- (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT))) {`
	`266`	`+ if (stream->status_code / 100 == 1) {`
`269`	`267`	`return NGHTTP2_ERR_HTTP_HEADER;`
`270`	`268`	`}`
	`269`	`+ /* https://tools.ietf.org/html/rfc7230#section-3.3.3 */`
	`270`	`+ if (stream->status_code / 100 == 2 &&`
	`271`	`+ (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT)) {`
	`272`	`+ return NGHTTP2_ERR_REMOVE_HTTP_HEADER;`
	`273`	`+ }`
`271`	`274`	`if (stream->content_length != -1) {`
`272`	`275`	`return NGHTTP2_ERR_HTTP_HEADER;`
`273`	`276`	`}`