mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 05:08:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'update-nghttp2' into release-3.26

Browse Source 
5872d9bd4d Merge branch 'upstream-nghttp2' into update-nghttp2
7eee97387a nghttp2 2023-02-13 (be049129)
b9221fcc17 nghttp2: Update script to get nghttp2 1.52.0
36d31dc996 Merge branch 'upstream-nghttp2' into update-nghttp2
2355f50277 nghttp2 2022-09-21 (87fef4ab)
1ca53784ca nghttp2: Update import script to fix version header
bfca444b92 nghttp2: Drop unused configuration value from build within CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8217
This commit is contained in:
Brad King
2023-02-17 13:51:42 +00:00
committed by Kitware Robot
parent 2a758e34ea 5872d9bd4d
commit f301108f56
5 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/Scripts/update-nghttp2.bash
View File

@@ -8,7 +8,7 @@ readonly name="nghttp2"
readonly ownership="nghttp2 upstream <kwrobot@kitware.com>"
readonly subtree="Utilities/cmnghttp2"
readonly repo="https://github.com/nghttp2/nghttp2.git"
readonly tag="v1.50.0"
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.40.0/;s/@PACKAGE_VERSION_NUM@/0x012800/' lib/includes/nghttp2/nghttp2ver.h
sed -i 's/@PACKAGE_VERSION@/1.52.0/;s/@PACKAGE_VERSION_NUM@/0x013400/' lib/includes/nghttp2/nghttp2ver.h
popd
}

3
Utilities/cmnghttp2/cmakeconfig.h.in
View File

@@ -8,9 +8,6 @@
/* Define to `int' if <sys/types.h> 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 <arpa/inet.h> header file. */
#cmakedefine HAVE_ARPA_INET_H 1

6
Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2.h
View File

@@ -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.

4
Utilities/cmnghttp2/lib/includes/nghttp2/nghttp2ver.h
View File

@@ -29,7 +29,7 @@
* @macro
* Version number of the nghttp2 library release
*/
#define NGHTTP2_VERSION "1.40.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 0x012800
#define NGHTTP2_VERSION_NUM 0x013400
#endif /* NGHTTP2VER_H */

8
Utilities/cmnghttp2/lib/nghttp2_net.h
View File

@@ -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;
}