diff options
author | Brad King <brad.king@kitware.com> | 2023-02-16 20:24:14 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-02-16 20:24:14 (GMT) |
commit | 5872d9bd4d330a5dfe9d2ab5d749f1f319a5dad6 (patch) | |
tree | 4e4ceefaeb527fe2d8b63b1092c6ea197a667210 | |
parent | b9221fcc17c0fec6e5092d7885a339ae01355190 (diff) | |
parent | 7eee97387a4e7e8a6ae1c59168a3d5c303076dcc (diff) | |
download | CMake-5872d9bd4d330a5dfe9d2ab5d749f1f319a5dad6.zip CMake-5872d9bd4d330a5dfe9d2ab5d749f1f319a5dad6.tar.gz CMake-5872d9bd4d330a5dfe9d2ab5d749f1f319a5dad6.tar.bz2 |
Merge branch 'upstream-nghttp2' into update-nghttp2
# By nghttp2 upstream
* upstream-nghttp2:
nghttp2 2023-02-13 (be049129)
-rw-r--r-- | Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h | 6 | ||||
-rw-r--r-- | Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h | 4 | ||||
-rw-r--r-- | Utilities/cmnghttp2/lib/nghttp2_net.h | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h b/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h index 61a14d9..65077dd 100644 --- a/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h +++ b/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h @@ -1430,12 +1430,6 @@ typedef ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf, * respectively. The header name/value pairs are emitted via * :type:`nghttp2_on_header_callback`. * - * For HEADERS, PUSH_PROMISE and DATA frames, this callback may be - * called after stream is closed (see - * :type:`nghttp2_on_stream_close_callback`). The application should - * check that stream is still alive using its own stream management or - * :func:`nghttp2_session_get_stream_user_data()`. - * * Only HEADERS and DATA frame can signal the end of incoming data. * If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the * |frame| is the last frame from the remote peer in this stream. diff --git a/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h b/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h index 0e50361..6ed0ac4 100644 --- a/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h +++ b/Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.50.0" +#define NGHTTP2_VERSION "1.52.0" /** * @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 0x013200 +#define NGHTTP2_VERSION_NUM 0x013400 #endif /* NGHTTP2VER_H */ diff --git a/Utilities/cmnghttp2/lib/nghttp2_net.h b/Utilities/cmnghttp2/lib/nghttp2_net.h index 345f6c8..521f981 100644 --- a/Utilities/cmnghttp2/lib/nghttp2_net.h +++ b/Utilities/cmnghttp2/lib/nghttp2_net.h @@ -71,9 +71,9 @@ STIN uint16_t htons(uint16_t hostshort) { STIN uint32_t ntohl(uint32_t netlong) { uint32_t res; unsigned char *p = (unsigned char *)&netlong; - res = *p++ << 24; - res += *p++ << 16; - res += *p++ << 8; + res = (uint32_t)(*p++ << 24); + res += (uint32_t)(*p++ << 16); + res += (uint32_t)(*p++ << 8); res += *p; return res; } @@ -81,7 +81,7 @@ STIN uint32_t ntohl(uint32_t netlong) { STIN uint16_t ntohs(uint16_t netshort) { uint16_t res; unsigned char *p = (unsigned char *)&netshort; - res = *p++ << 8; + res = (uint16_t)(*p++ << 8); res += *p; return res; } |