Skip to content

Commit 8287975

Browse files
robot-pigletrobot-piglet
committed
Update contrib/libs/nghttp2 to 1.68.0
commit_hash:5648f3326db54801982d8b3293b86e9f007eb3d6
1 parent 3b660b0 commit 8287975

33 files changed

+136
-85
lines changed

‎contrib/libs/nghttp2/.yandex_meta/override.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pkgs: attrs: with pkgs; with attrs; rec {
2-
version = "1.67.1";
2+
version = "1.68.0";
33

44
src = fetchFromGitHub {
55
owner = "nghttp2";
66
repo = "nghttp2";
77
rev = "v${version}";
8-
hash = "sha256-LpuOPC82Rt9EvvLvAYGXRpQYz50Q/Ec3VYTS6/xehAA=";
8+
hash = "sha256-qH0QsedFWj+cpmm9jc3DG6gxb4O+znpn2seiY6y0EjM=";
99
};
1010

1111
patches = [];

‎contrib/libs/nghttp2/README.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ following libraries are required:
126126
<https://github.com/quictls/openssl/tree/OpenSSL_1_1_1w+quic>`_; or
127127
wolfSSL; or LibreSSL (does not support 0RTT); or aws-lc; or
128128
`BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
129-
729648fb79df7bc46c145e49b0dfd8d2a24232f1); or OpenSSL >= 3.5.0
130-
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 1.15.0
131-
* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 1.11.0
129+
db1a8456167249f95b854a1cd24c6b553d0f1567); or OpenSSL >= 3.5.0
130+
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 1.16.0
131+
* `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 1.12.0
132132

133133
Use ``--enable-http3`` configure option to enable HTTP/3 feature for
134134
h2load and nghttpx.
@@ -340,7 +340,7 @@ Build aws-lc:
340340

341341
.. code-block:: text
342342
343-
$ git clone --depth 1 -b v1.58.1 https://github.com/aws/aws-lc
343+
$ git clone --depth 1 -b v1.62.0 https://github.com/aws/aws-lc
344344
$ cd aws-lc
345345
$ cmake -B build -DDISABLE_GO=ON --install-prefix=$PWD/opt
346346
$ make -j$(nproc) -C build
@@ -351,7 +351,7 @@ Build nghttp3:
351351

352352
.. code-block:: text
353353
354-
$ git clone --depth 1 -b v1.11.0 https://github.com/ngtcp2/nghttp3
354+
$ git clone --depth 1 -b v1.12.0 https://github.com/ngtcp2/nghttp3
355355
$ cd nghttp3
356356
$ git submodule update --init --depth 1
357357
$ autoreconf -i
@@ -364,7 +364,7 @@ Build ngtcp2:
364364

365365
.. code-block:: text
366366
367-
$ git clone --depth 1 -b v1.15.1 https://github.com/ngtcp2/ngtcp2
367+
$ git clone --depth 1 -b v1.17.0 https://github.com/ngtcp2/ngtcp2
368368
$ cd ngtcp2
369369
$ git submodule update --init --depth 1
370370
$ autoreconf -i

‎contrib/libs/nghttp2/config-linux.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
#define PACKAGE_NAME "nghttp2"
281281

282282
/* Define to the full name and version of this package. */
283-
#define PACKAGE_STRING "nghttp2 1.67.1"
283+
#define PACKAGE_STRING "nghttp2 1.68.0"
284284

285285
/* Define to the one symbol short name of this package. */
286286
#define PACKAGE_TARNAME "nghttp2"
@@ -289,7 +289,7 @@
289289
#define PACKAGE_URL ""
290290

291291
/* Define to the version of this package. */
292-
#define PACKAGE_VERSION "1.67.1"
292+
#define PACKAGE_VERSION "1.68.0"
293293

294294
/* Define to 1 if all of the C89 standard headers exist (not just the ones
295295
required in a freestanding environment). This macro is provided for
@@ -392,7 +392,7 @@
392392

393393

394394
/* Version number of package */
395-
#define VERSION "1.67.1"
395+
#define VERSION "1.68.0"
396396

397397
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
398398
significant byte first (like Motorola and SPARC, unlike Intel). */

‎contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h‎

Lines changed: 2 additions & 2 deletions
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.67.1"
32+
#define NGHTTP2_VERSION "1.68.0"
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 0x014301
40+
#define NGHTTP2_VERSION_NUM 0x014400
4141

4242
#endif /* NGHTTP2VER_H */

‎contrib/libs/nghttp2/lib/nghttp2_alpn.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
#ifdef HAVE_CONFIG_H
2929
# include <config.h>
30-
#endif /* HAVE_CONFIG_H */
30+
#endif /* defined(HAVE_CONFIG_H) */
3131

3232
#include <nghttp2/nghttp2.h>
3333

34-
#endif /* NGHTTP2_ALPN_H */
34+
#endif /* !defined(NGHTTP2_ALPN_H) */

‎contrib/libs/nghttp2/lib/nghttp2_buf.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifdef HAVE_CONFIG_H
2929
# include <config.h>
30-
#endif /* HAVE_CONFIG_H */
30+
#endif /* defined(HAVE_CONFIG_H) */
3131

3232
#include <nghttp2/nghttp2.h>
3333

@@ -409,4 +409,4 @@ int nghttp2_bufs_next_present(nghttp2_bufs *bufs);
409409
*/
410410
size_t nghttp2_bufs_len(nghttp2_bufs *bufs);
411411

412-
#endif /* NGHTTP2_BUF_H */
412+
#endif /* !defined(NGHTTP2_BUF_H) */

‎contrib/libs/nghttp2/lib/nghttp2_callbacks.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifdef HAVE_CONFIG_H
2929
# include <config.h>
30-
#endif /* HAVE_CONFIG_H */
30+
#endif /* defined(HAVE_CONFIG_H) */
3131

3232
#include <nghttp2/nghttp2.h>
3333

@@ -154,4 +154,4 @@ struct nghttp2_session_callbacks {
154154
nghttp2_rand_callback rand_callback;
155155
};
156156

157-
#endif /* NGHTTP2_CALLBACKS_H */
157+
#endif /* !defined(NGHTTP2_CALLBACKS_H) */

‎contrib/libs/nghttp2/lib/nghttp2_debug.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ void nghttp2_set_debug_vprintf_callback(
5050
static_debug_vprintf_callback = debug_vprintf_callback;
5151
}
5252

53-
#else /* !DEBUGBUILD */
53+
#else /* !defined(DEBUGBUILD) */
5454

5555
void nghttp2_set_debug_vprintf_callback(
5656
nghttp2_debug_vprintf_callback debug_vprintf_callback) {
5757
(void)debug_vprintf_callback;
5858
}
5959

60-
#endif /* !DEBUGBUILD */
60+
#endif /* !defined(DEBUGBUILD) */

‎contrib/libs/nghttp2/lib/nghttp2_debug.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727

2828
#ifdef HAVE_CONFIG_H
2929
# include <config.h>
30-
#endif /* HAVE_CONFIG_H */
30+
#endif /* defined(HAVE_CONFIG_H) */
3131

3232
#include <nghttp2/nghttp2.h>
3333

3434
#ifdef DEBUGBUILD
3535
# define DEBUGF(...) nghttp2_debug_vprintf(__VA_ARGS__)
3636
void nghttp2_debug_vprintf(const char *format, ...);
37-
#else
37+
#else /* !defined(DEBUGBUILD) */
3838
# define DEBUGF(...) \
3939
do { \
4040
} while (0)
41-
#endif
41+
#endif /* !defined(DEBUGBUILD) */
4242

43-
#endif /* NGHTTP2_DEBUG_H */
43+
#endif /* !defined(NGHTTP2_DEBUG_H) */

‎contrib/libs/nghttp2/lib/nghttp2_extpri.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#ifdef HAVE_CONFIG_H
3030
# include <config.h>
31-
#endif /* HAVE_CONFIG_H */
31+
#endif /* defined(HAVE_CONFIG_H) */
3232

3333
#include <nghttp2/nghttp2.h>
3434

@@ -62,4 +62,4 @@ void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri);
6262
*/
6363
#define nghttp2_extpri_uint8_inc(PRI) (((PRI) & NGHTTP2_EXTPRI_INC_MASK) != 0)
6464

65-
#endif /* NGHTTP2_EXTPRI_H */
65+
#endif /* !defined(NGHTTP2_EXTPRI_H) */

0 commit comments

Comments
 (0)