From bfca444b92f6b1eb5db81ac17aafcd8241b94419 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Feb 2023 15:13:52 -0500 Subject: nghttp2: Drop unused configuration value from build within CMake Since commit 7ce2a682a3 (nghttp2 2022-09-21 (87fef4ab), 2022-09-21, v3.26.0-rc1~455^2~1^2) we do not need `SIZEOF_INT_P`. --- Utilities/cmnghttp2/cmakeconfig.h.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/Utilities/cmnghttp2/cmakeconfig.h.in b/Utilities/cmnghttp2/cmakeconfig.h.in index 60698fb..8b14df2 100644 --- a/Utilities/cmnghttp2/cmakeconfig.h.in +++ b/Utilities/cmnghttp2/cmakeconfig.h.in @@ -8,9 +8,6 @@ /* Define to `int' if does not define. */ #cmakedefine ssize_t @ssize_t@ -/* sizeof(int *) */ -#define SIZEOF_INT_P KWIML_ABI_SIZEOF_DATA_PTR - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ARPA_INET_H 1 -- cgit v0.12 From 1ca53784cae82bd3025f8a8f2ffc08665d3a35e1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Feb 2023 15:15:48 -0500 Subject: nghttp2: Update import script to fix version header In commit 66c9536775 (nghttp2: Update script to get nghttp2 1.50.0, 2022-10-31, v3.26.0-rc1~455^2~2) we forgot to update the `nghttp2ver.h` replacements to provide the proper `NGHTTP2_VERSION_NUM`. This causes our build of curl to think it is using a different version of nghttp2 than we provide. Fix the version and add a reminder comment. Issue: #24419 --- Utilities/Scripts/update-nghttp2.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/Scripts/update-nghttp2.bash b/Utilities/Scripts/update-nghttp2.bash index bc76377..db2094e 100755 --- a/Utilities/Scripts/update-nghttp2.bash +++ b/Utilities/Scripts/update-nghttp2.bash @@ -8,7 +8,7 @@ readonly name="nghttp2" readonly ownership="nghttp2 upstream " readonly subtree="Utilities/cmnghttp2" readonly repo="https://github.com/nghttp2/nghttp2.git" -readonly tag="v1.50.0" +readonly tag="v1.50.0" # When updating, sync PACKAGE_VERSION below! readonly shortlog=false readonly paths=" COPYING @@ -23,7 +23,7 @@ extract_source () { pushd "${extractdir}/${name}-reduced" echo "* -whitespace" > .gitattributes mv lib/includes/nghttp2/nghttp2ver.h.in lib/includes/nghttp2/nghttp2ver.h - sed -i 's/@PACKAGE_VERSION@/1.40.0/;s/@PACKAGE_VERSION_NUM@/0x012800/' lib/includes/nghttp2/nghttp2ver.h + sed -i 's/@PACKAGE_VERSION@/1.50.0/;s/@PACKAGE_VERSION_NUM@/0x013200/' lib/includes/nghttp2/nghttp2ver.h popd } -- cgit v0.12 From 2355f502779794a1f446449707f20edbd284a8b9 Mon Sep 17 00:00:00 2001 From: nghttp2 upstream Date: Wed, 21 Sep 2022 16:55:07 +0900 Subject: nghttp2 2022-09-21 (87fef4ab) Code extracted from: https://github.com/nghttp2/nghttp2.git at commit 87fef4ab71bebb2168f8d3d554df8d2f0f01f497 (v1.50.0). --- lib/includes/nghttp2/nghttp2ver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/includes/nghttp2/nghttp2ver.h b/lib/includes/nghttp2/nghttp2ver.h index 45d21e2..0e50361 100644 --- a/lib/includes/nghttp2/nghttp2ver.h +++ b/lib/includes/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.40.0" +#define NGHTTP2_VERSION "1.50.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 0x012800 +#define NGHTTP2_VERSION_NUM 0x013200 #endif /* NGHTTP2VER_H */ -- cgit v0.12 From b9221fcc17c0fec6e5092d7885a339ae01355190 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Feb 2023 15:23:56 -0500 Subject: nghttp2: Update script to get nghttp2 1.52.0 --- Utilities/Scripts/update-nghttp2.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/Scripts/update-nghttp2.bash b/Utilities/Scripts/update-nghttp2.bash index db2094e..c638efe 100755 --- a/Utilities/Scripts/update-nghttp2.bash +++ b/Utilities/Scripts/update-nghttp2.bash @@ -8,7 +8,7 @@ readonly name="nghttp2" readonly ownership="nghttp2 upstream " readonly subtree="Utilities/cmnghttp2" readonly repo="https://github.com/nghttp2/nghttp2.git" -readonly tag="v1.50.0" # When updating, sync PACKAGE_VERSION below! +readonly tag="v1.52.0" # When updating, sync PACKAGE_VERSION below! readonly shortlog=false readonly paths=" COPYING @@ -23,7 +23,7 @@ extract_source () { pushd "${extractdir}/${name}-reduced" echo "* -whitespace" > .gitattributes mv lib/includes/nghttp2/nghttp2ver.h.in lib/includes/nghttp2/nghttp2ver.h - sed -i 's/@PACKAGE_VERSION@/1.50.0/;s/@PACKAGE_VERSION_NUM@/0x013200/' lib/includes/nghttp2/nghttp2ver.h + sed -i 's/@PACKAGE_VERSION@/1.52.0/;s/@PACKAGE_VERSION_NUM@/0x013400/' lib/includes/nghttp2/nghttp2ver.h popd } -- cgit v0.12 From 7eee97387a4e7e8a6ae1c59168a3d5c303076dcc Mon Sep 17 00:00:00 2001 From: nghttp2 upstream Date: Mon, 13 Feb 2023 20:59:29 +0900 Subject: nghttp2 2023-02-13 (be049129) Code extracted from: https://github.com/nghttp2/nghttp2.git at commit be0491294a63d891bd12b6b1b7e372a45a5d0ffe (v1.52.0). --- lib/includes/nghttp2/nghttp2.h | 6 ------ lib/includes/nghttp2/nghttp2ver.h | 4 ++-- lib/nghttp2_net.h | 8 ++++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/includes/nghttp2/nghttp2.h b/lib/includes/nghttp2/nghttp2.h index 61a14d9..65077dd 100644 --- a/lib/includes/nghttp2/nghttp2.h +++ b/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/lib/includes/nghttp2/nghttp2ver.h b/lib/includes/nghttp2/nghttp2ver.h index 0e50361..6ed0ac4 100644 --- a/lib/includes/nghttp2/nghttp2ver.h +++ b/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/lib/nghttp2_net.h b/lib/nghttp2_net.h index 345f6c8..521f981 100644 --- a/lib/nghttp2_net.h +++ b/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; } -- cgit v0.12