diff options
| author | gengjiawen <technicalcute@gmail.com> | 2019-06-27 21:42:36 +0800 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-07-21 21:22:17 -0700 |
| commit | 447947aef480350053a5e93be448e751ff329cd2 (patch) | |
| tree | 45ca29c3fc40bc341a74e248aed7816ac8436bd8 /deps | |
| parent | 8b344ae4c23ad6bd2a3e2927e95595011c1ff289 (diff) | |
| download | android-node-v8-447947aef480350053a5e93be448e751ff329cd2.tar.gz android-node-v8-447947aef480350053a5e93be448e751ff329cd2.tar.bz2 android-node-v8-447947aef480350053a5e93be448e751ff329cd2.zip | |
deps: update nghttp2 to 1.39.1
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h | 4 | ||||
| -rw-r--r-- | deps/nghttp2/lib/nghttp2_http.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h index 7ddf43e703..210cfaa16a 100644 --- a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h +++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.38.0" +#define NGHTTP2_VERSION "1.39.1" /** * @macro @@ -37,6 +37,6 @@ * 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 index 6e8acfdcc1..8d99029983 100644 --- 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; } |