Skip to content

Commit 685c7d4

Browse files
thunder-codingtargos
thunder-coding
authored and
targos
committed
deps: update nghttp2 to v1.45.1
PR-URL: #40206 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent 7fbfb66 commit 685c7d4

19 files changed

+882
-1689
lines changed

‎deps/nghttp2/lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ set(NGHTTP2_SOURCES
2424
nghttp2_http.c
2525
nghttp2_rcbuf.c
2626
nghttp2_debug.c
27-
nghttp2_ksl.c
2827
)
2928

3029
set(NGHTTP2_RES "")

‎deps/nghttp2/lib/Makefile.am

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ EXTRA_DIST = Makefile.msvc CMakeLists.txt version.rc.in
2727
AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
2828
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
2929
@DEFS@
30+
AM_LDFLAGS = @LIBTOOL_LDFLAGS@
3031

3132
pkgconfigdir = $(libdir)/pkgconfig
3233
pkgconfig_DATA = libnghttp2.pc
@@ -49,8 +50,7 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
4950
nghttp2_mem.c \
5051
nghttp2_http.c \
5152
nghttp2_rcbuf.c \
52-
nghttp2_debug.c \
53-
nghttp2_ksl.c
53+
nghttp2_debug.c
5454

5555
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
5656
nghttp2_frame.h \
@@ -66,9 +66,8 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
6666
nghttp2_mem.h \
6767
nghttp2_http.h \
6868
nghttp2_rcbuf.h \
69-
nghttp2_debug.h \
70-
nghttp2_ksl.h
69+
nghttp2_debug.h
7170

7271
libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
73-
libnghttp2_la_LDFLAGS = -no-undefined \
72+
libnghttp2_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
7473
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

‎deps/nghttp2/lib/Makefile.in

+26-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.2 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.4 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -162,7 +162,7 @@ am__objects_2 = nghttp2_pq.lo nghttp2_map.lo nghttp2_queue.lo \
162162
nghttp2_hd_huffman.lo nghttp2_hd_huffman_data.lo \
163163
nghttp2_version.lo nghttp2_priority_spec.lo nghttp2_option.lo \
164164
nghttp2_callbacks.lo nghttp2_mem.lo nghttp2_http.lo \
165-
nghttp2_rcbuf.lo nghttp2_debug.lo nghttp2_ksl.lo
165+
nghttp2_rcbuf.lo nghttp2_debug.lo
166166
am_libnghttp2_la_OBJECTS = $(am__objects_1) $(am__objects_2)
167167
libnghttp2_la_OBJECTS = $(am_libnghttp2_la_OBJECTS)
168168
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -193,9 +193,8 @@ am__depfiles_remade = ./$(DEPDIR)/nghttp2_buf.Plo \
193193
./$(DEPDIR)/nghttp2_hd.Plo ./$(DEPDIR)/nghttp2_hd_huffman.Plo \
194194
./$(DEPDIR)/nghttp2_hd_huffman_data.Plo \
195195
./$(DEPDIR)/nghttp2_helper.Plo ./$(DEPDIR)/nghttp2_http.Plo \
196-
./$(DEPDIR)/nghttp2_ksl.Plo ./$(DEPDIR)/nghttp2_map.Plo \
197-
./$(DEPDIR)/nghttp2_mem.Plo ./$(DEPDIR)/nghttp2_npn.Plo \
198-
./$(DEPDIR)/nghttp2_option.Plo \
196+
./$(DEPDIR)/nghttp2_map.Plo ./$(DEPDIR)/nghttp2_mem.Plo \
197+
./$(DEPDIR)/nghttp2_npn.Plo ./$(DEPDIR)/nghttp2_option.Plo \
199198
./$(DEPDIR)/nghttp2_outbound_item.Plo \
200199
./$(DEPDIR)/nghttp2_pq.Plo \
201200
./$(DEPDIR)/nghttp2_priority_spec.Plo \
@@ -262,8 +261,6 @@ am__define_uniq_tagged_files = \
262261
unique=`for i in $$list; do \
263262
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
264263
done | $(am__uniquify_input)`
265-
ETAGS = etags
266-
CTAGS = ctags
267264
DIST_SUBDIRS = $(SUBDIRS)
268265
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libnghttp2.pc.in \
269266
$(top_srcdir)/depcomp
@@ -307,11 +304,14 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
307304
BOOST_LDFLAGS = @BOOST_LDFLAGS@
308305
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
309306
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
307+
BPFCFLAGS = @BPFCFLAGS@
310308
CC = @CC@
311309
CCDEPMODE = @CCDEPMODE@
312310
CFLAGS = @CFLAGS@
313311
CPP = @CPP@
314312
CPPFLAGS = @CPPFLAGS@
313+
CSCOPE = @CSCOPE@
314+
CTAGS = @CTAGS@
315315
CUNIT_CFLAGS = @CUNIT_CFLAGS@
316316
CUNIT_LIBS = @CUNIT_LIBS@
317317
CXX = @CXX@
@@ -330,8 +330,11 @@ ECHO_C = @ECHO_C@
330330
ECHO_N = @ECHO_N@
331331
ECHO_T = @ECHO_T@
332332
EGREP = @EGREP@
333+
ETAGS = @ETAGS@
333334
EXEEXT = @EXEEXT@
335+
EXTRABPFCFLAGS = @EXTRABPFCFLAGS@
334336
EXTRACFLAG = @EXTRACFLAG@
337+
EXTRA_DEFS = @EXTRA_DEFS@
335338
FGREP = @FGREP@
336339
GREP = @GREP@
337340
HAVE_CXX14 = @HAVE_CXX14@
@@ -342,9 +345,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
342345
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
343346
JANSSON_CFLAGS = @JANSSON_CFLAGS@
344347
JANSSON_LIBS = @JANSSON_LIBS@
348+
JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@
345349
JEMALLOC_LIBS = @JEMALLOC_LIBS@
346350
LD = @LD@
347351
LDFLAGS = @LDFLAGS@
352+
LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
353+
LIBBPF_LIBS = @LIBBPF_LIBS@
348354
LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
349355
LIBCARES_LIBS = @LIBCARES_LIBS@
350356
LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@
@@ -353,9 +359,16 @@ LIBEV_CFLAGS = @LIBEV_CFLAGS@
353359
LIBEV_LIBS = @LIBEV_LIBS@
354360
LIBMRUBY_CFLAGS = @LIBMRUBY_CFLAGS@
355361
LIBMRUBY_LIBS = @LIBMRUBY_LIBS@
362+
LIBNGHTTP3_CFLAGS = @LIBNGHTTP3_CFLAGS@
363+
LIBNGHTTP3_LIBS = @LIBNGHTTP3_LIBS@
364+
LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
365+
LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
366+
LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_LIBS@
367+
LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
356368
LIBOBJS = @LIBOBJS@
357369
LIBS = @LIBS@
358370
LIBTOOL = @LIBTOOL@
371+
LIBTOOL_LDFLAGS = @LIBTOOL_LDFLAGS@
359372
LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
360373
LIBXML2_LIBS = @LIBXML2_LIBS@
361374
LIPO = @LIPO@
@@ -393,7 +406,7 @@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
393406
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
394407
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
395408
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
396-
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
409+
PYTHON_LIBS = @PYTHON_LIBS@
397410
PYTHON_PLATFORM = @PYTHON_PLATFORM@
398411
PYTHON_PREFIX = @PYTHON_PREFIX@
399412
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
@@ -487,6 +500,7 @@ AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
487500
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
488501
@DEFS@
489502

503+
AM_LDFLAGS = @LIBTOOL_LDFLAGS@
490504
pkgconfigdir = $(libdir)/pkgconfig
491505
pkgconfig_DATA = libnghttp2.pc
492506
DISTCLEANFILES = $(pkgconfig_DATA)
@@ -506,8 +520,7 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
506520
nghttp2_mem.c \
507521
nghttp2_http.c \
508522
nghttp2_rcbuf.c \
509-
nghttp2_debug.c \
510-
nghttp2_ksl.c
523+
nghttp2_debug.c
511524

512525
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
513526
nghttp2_frame.h \
@@ -523,11 +536,10 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
523536
nghttp2_mem.h \
524537
nghttp2_http.h \
525538
nghttp2_rcbuf.h \
526-
nghttp2_debug.h \
527-
nghttp2_ksl.h
539+
nghttp2_debug.h
528540

529541
libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
530-
libnghttp2_la_LDFLAGS = -no-undefined \
542+
libnghttp2_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
531543
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
532544

533545
all: all-recursive
@@ -619,7 +631,6 @@ distclean-compile:
619631
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_hd_huffman_data.Plo@am__quote@ # am--include-marker
620632
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_helper.Plo@am__quote@ # am--include-marker
621633
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_http.Plo@am__quote@ # am--include-marker
622-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_ksl.Plo@am__quote@ # am--include-marker
623634
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_map.Plo@am__quote@ # am--include-marker
624635
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_mem.Plo@am__quote@ # am--include-marker
625636
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_npn.Plo@am__quote@ # am--include-marker
@@ -789,7 +800,6 @@ cscopelist-am: $(am__tagged_files)
789800

790801
distclean-tags:
791802
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
792-
793803
distdir: $(BUILT_SOURCES)
794804
$(MAKE) $(AM_MAKEFLAGS) distdir-am
795805

@@ -902,7 +912,6 @@ distclean: distclean-recursive
902912
-rm -f ./$(DEPDIR)/nghttp2_hd_huffman_data.Plo
903913
-rm -f ./$(DEPDIR)/nghttp2_helper.Plo
904914
-rm -f ./$(DEPDIR)/nghttp2_http.Plo
905-
-rm -f ./$(DEPDIR)/nghttp2_ksl.Plo
906915
-rm -f ./$(DEPDIR)/nghttp2_map.Plo
907916
-rm -f ./$(DEPDIR)/nghttp2_mem.Plo
908917
-rm -f ./$(DEPDIR)/nghttp2_npn.Plo
@@ -970,7 +979,6 @@ maintainer-clean: maintainer-clean-recursive
970979
-rm -f ./$(DEPDIR)/nghttp2_hd_huffman_data.Plo
971980
-rm -f ./$(DEPDIR)/nghttp2_helper.Plo
972981
-rm -f ./$(DEPDIR)/nghttp2_http.Plo
973-
-rm -f ./$(DEPDIR)/nghttp2_ksl.Plo
974982
-rm -f ./$(DEPDIR)/nghttp2_map.Plo
975983
-rm -f ./$(DEPDIR)/nghttp2_mem.Plo
976984
-rm -f ./$(DEPDIR)/nghttp2_npn.Plo

‎deps/nghttp2/lib/includes/Makefile.in

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.2 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.4 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -197,8 +197,6 @@ am__define_uniq_tagged_files = \
197197
unique=`for i in $$list; do \
198198
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
199199
done | $(am__uniquify_input)`
200-
ETAGS = etags
201-
CTAGS = ctags
202200
am__DIST_COMMON = $(srcdir)/Makefile.in
203201
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
204202
ACLOCAL = @ACLOCAL@
@@ -215,11 +213,14 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
215213
BOOST_LDFLAGS = @BOOST_LDFLAGS@
216214
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
217215
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
216+
BPFCFLAGS = @BPFCFLAGS@
218217
CC = @CC@
219218
CCDEPMODE = @CCDEPMODE@
220219
CFLAGS = @CFLAGS@
221220
CPP = @CPP@
222221
CPPFLAGS = @CPPFLAGS@
222+
CSCOPE = @CSCOPE@
223+
CTAGS = @CTAGS@
223224
CUNIT_CFLAGS = @CUNIT_CFLAGS@
224225
CUNIT_LIBS = @CUNIT_LIBS@
225226
CXX = @CXX@
@@ -238,8 +239,11 @@ ECHO_C = @ECHO_C@
238239
ECHO_N = @ECHO_N@
239240
ECHO_T = @ECHO_T@
240241
EGREP = @EGREP@
242+
ETAGS = @ETAGS@
241243
EXEEXT = @EXEEXT@
244+
EXTRABPFCFLAGS = @EXTRABPFCFLAGS@
242245
EXTRACFLAG = @EXTRACFLAG@
246+
EXTRA_DEFS = @EXTRA_DEFS@
243247
FGREP = @FGREP@
244248
GREP = @GREP@
245249
HAVE_CXX14 = @HAVE_CXX14@
@@ -250,9 +254,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
250254
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
251255
JANSSON_CFLAGS = @JANSSON_CFLAGS@
252256
JANSSON_LIBS = @JANSSON_LIBS@
257+
JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@
253258
JEMALLOC_LIBS = @JEMALLOC_LIBS@
254259
LD = @LD@
255260
LDFLAGS = @LDFLAGS@
261+
LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
262+
LIBBPF_LIBS = @LIBBPF_LIBS@
256263
LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
257264
LIBCARES_LIBS = @LIBCARES_LIBS@
258265
LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@
@@ -261,9 +268,16 @@ LIBEV_CFLAGS = @LIBEV_CFLAGS@
261268
LIBEV_LIBS = @LIBEV_LIBS@
262269
LIBMRUBY_CFLAGS = @LIBMRUBY_CFLAGS@
263270
LIBMRUBY_LIBS = @LIBMRUBY_LIBS@
271+
LIBNGHTTP3_CFLAGS = @LIBNGHTTP3_CFLAGS@
272+
LIBNGHTTP3_LIBS = @LIBNGHTTP3_LIBS@
273+
LIBNGTCP2_CFLAGS = @LIBNGTCP2_CFLAGS@
274+
LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS = @LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS@
275+
LIBNGTCP2_CRYPTO_OPENSSL_LIBS = @LIBNGTCP2_CRYPTO_OPENSSL_LIBS@
276+
LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
264277
LIBOBJS = @LIBOBJS@
265278
LIBS = @LIBS@
266279
LIBTOOL = @LIBTOOL@
280+
LIBTOOL_LDFLAGS = @LIBTOOL_LDFLAGS@
267281
LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
268282
LIBXML2_LIBS = @LIBXML2_LIBS@
269283
LIPO = @LIPO@
@@ -301,7 +315,7 @@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
301315
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
302316
PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@
303317
PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
304-
PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
318+
PYTHON_LIBS = @PYTHON_LIBS@
305319
PYTHON_PLATFORM = @PYTHON_PLATFORM@
306320
PYTHON_PREFIX = @PYTHON_PREFIX@
307321
PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
@@ -497,7 +511,6 @@ cscopelist-am: $(am__tagged_files)
497511

498512
distclean-tags:
499513
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
500-
501514
distdir: $(BUILT_SOURCES)
502515
$(MAKE) $(AM_MAKEFLAGS) distdir-am
503516

0 commit comments

Comments
 (0)