Skip to content

Commit 33d4d91

Browse files
gengjiawenBethGriggs
authored andcommittedAug 15, 2019
deps: update nghttp2 to 1.39.1
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>
1 parent 17fad97 commit 33d4d91

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
 

‎deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
* @macro
3030
* Version number of the nghttp2 library release
3131
*/
32-
#define NGHTTP2_VERSION "1.38.0"
32+
#define NGHTTP2_VERSION "1.39.1"
3333

3434
/**
3535
* @macro
3636
* Numerical representation of the version number of the nghttp2 library
3737
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3838
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3939
*/
40-
#define NGHTTP2_VERSION_NUM 0x012600
40+
#define NGHTTP2_VERSION_NUM 0x012701
4141

4242
#endif /* NGHTTP2VER_H */

‎deps/nghttp2/lib/nghttp2_http.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,14 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
263263
stream->content_length = 0;
264264
return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
265265
}
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) {
269267
return NGHTTP2_ERR_HTTP_HEADER;
270268
}
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+
}
271274
if (stream->content_length != -1) {
272275
return NGHTTP2_ERR_HTTP_HEADER;
273276
}

0 commit comments

Comments
 (0)
Please sign in to comment.