Skip to content

Commit 03f6005

Browse files
achamayouachamayou
authored
Update nghttp2 from 1.55.1 to 1.64.0 (#6724)
1 parent 68ba22c commit 03f6005

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+8528
-6736
lines changed

‎3rdparty/exported/nghttp2/CMakeLists.txt‎

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(NGHTTP2_SOURCES
1414
nghttp2_stream.c nghttp2_outbound_item.c
1515
nghttp2_session.c nghttp2_submit.c
1616
nghttp2_helper.c
17-
nghttp2_npn.c
17+
nghttp2_alpn.c
1818
nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c
1919
nghttp2_version.c
2020
nghttp2_priority_spec.c
@@ -24,11 +24,19 @@ set(NGHTTP2_SOURCES
2424
nghttp2_http.c
2525
nghttp2_rcbuf.c
2626
nghttp2_extpri.c
27+
nghttp2_ratelim.c
28+
nghttp2_time.c
2729
nghttp2_debug.c
2830
sfparse.c
2931
)
3032

3133
set(NGHTTP2_RES "")
34+
set(STATIC_LIB "nghttp2_static")
35+
set(SHARED_LIB "nghttp2")
36+
37+
if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS AND MSVC AND NOT STATIC_LIB_SUFFIX)
38+
set(STATIC_LIB_SUFFIX "_static")
39+
endif()
3240

3341
if(WIN32)
3442
configure_file(
@@ -39,40 +47,61 @@ if(WIN32)
3947
set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
4048
endif()
4149

50+
set(EXPORT_SET "${PROJECT_NAME}-targets")
51+
4252
# Public shared library
43-
if(ENABLE_SHARED_LIB)
44-
add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
45-
set_target_properties(nghttp2 PROPERTIES
53+
if(BUILD_SHARED_LIBS)
54+
add_library(${SHARED_LIB} SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
55+
56+
set_target_properties(${SHARED_LIB} PROPERTIES
4657
COMPILE_FLAGS "${WARNCFLAGS}"
4758
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
4859
C_VISIBILITY_PRESET hidden
4960
)
50-
target_include_directories(nghttp2 INTERFACE
51-
"${CMAKE_CURRENT_BINARY_DIR}/includes"
52-
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
61+
62+
target_include_directories(${SHARED_LIB} INTERFACE
63+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>
64+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>
65+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
5366
)
5467

55-
install(TARGETS nghttp2
56-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
57-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
58-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
68+
install(TARGETS ${SHARED_LIB} EXPORT ${EXPORT_SET})
69+
list(APPEND nghttp2_exports ${SHARED_LIB})
5970
endif()
6071

61-
if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
62-
# Static library (for unittests because of symbol visibility)
63-
add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
64-
set_target_properties(nghttp2_static PROPERTIES
72+
# Static library (for unittests because of symbol visibility)
73+
if(BUILD_STATIC_LIBS)
74+
add_library(${STATIC_LIB} STATIC ${NGHTTP2_SOURCES})
75+
76+
set_target_properties(${STATIC_LIB} PROPERTIES
6577
COMPILE_FLAGS "${WARNCFLAGS}"
6678
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
6779
ARCHIVE_OUTPUT_NAME nghttp2${STATIC_LIB_SUFFIX}
6880
)
69-
target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
70-
if(ENABLE_STATIC_LIB)
71-
install(TARGETS nghttp2_static
72-
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
73-
endif()
81+
82+
target_include_directories(${STATIC_LIB} INTERFACE
83+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>
84+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>
85+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
86+
)
87+
88+
target_compile_definitions(${STATIC_LIB} PUBLIC "-DNGHTTP2_STATICLIB")
89+
90+
install(TARGETS ${STATIC_LIB} EXPORT ${EXPORT_SET})
91+
list(APPEND nghttp2_exports ${STATIC_LIB})
7492
endif()
7593

94+
if(BUILD_SHARED_LIBS)
95+
set(LIB_SELECTED ${SHARED_LIB})
96+
else()
97+
set(LIB_SELECTED ${STATIC_LIB})
98+
endif()
99+
100+
add_library(${PROJECT_NAME}::nghttp2 ALIAS ${LIB_SELECTED})
76101

77102
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
78103
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
104+
105+
install(EXPORT ${EXPORT_SET}
106+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
107+
NAMESPACE ${PROJECT_NAME}::)

‎3rdparty/exported/nghttp2/Makefile.am‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
4141
nghttp2_stream.c nghttp2_outbound_item.c \
4242
nghttp2_session.c nghttp2_submit.c \
4343
nghttp2_helper.c \
44-
nghttp2_npn.c \
44+
nghttp2_alpn.c \
4545
nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c \
4646
nghttp2_version.c \
4747
nghttp2_priority_spec.c \
@@ -51,14 +51,16 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
5151
nghttp2_http.c \
5252
nghttp2_rcbuf.c \
5353
nghttp2_extpri.c \
54+
nghttp2_ratelim.c \
55+
nghttp2_time.c \
5456
nghttp2_debug.c \
5557
sfparse.c
5658

5759
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
5860
nghttp2_frame.h \
5961
nghttp2_buf.h \
6062
nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
61-
nghttp2_npn.h \
63+
nghttp2_alpn.h \
6264
nghttp2_submit.h nghttp2_outbound_item.h \
6365
nghttp2_net.h \
6466
nghttp2_hd.h nghttp2_hd_huffman.h \
@@ -69,6 +71,8 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
6971
nghttp2_http.h \
7072
nghttp2_rcbuf.h \
7173
nghttp2_extpri.h \
74+
nghttp2_ratelim.h \
75+
nghttp2_time.h \
7276
nghttp2_debug.h \
7377
sfparse.h
7478

‎3rdparty/exported/nghttp2/Makefile.in‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,12 @@ am__objects_1 =
153153
am__objects_2 = nghttp2_pq.lo nghttp2_map.lo nghttp2_queue.lo \
154154
nghttp2_frame.lo nghttp2_buf.lo nghttp2_stream.lo \
155155
nghttp2_outbound_item.lo nghttp2_session.lo nghttp2_submit.lo \
156-
nghttp2_helper.lo nghttp2_npn.lo nghttp2_hd.lo \
156+
nghttp2_helper.lo nghttp2_alpn.lo nghttp2_hd.lo \
157157
nghttp2_hd_huffman.lo nghttp2_hd_huffman_data.lo \
158158
nghttp2_version.lo nghttp2_priority_spec.lo nghttp2_option.lo \
159159
nghttp2_callbacks.lo nghttp2_mem.lo nghttp2_http.lo \
160-
nghttp2_rcbuf.lo nghttp2_extpri.lo nghttp2_debug.lo sfparse.lo
160+
nghttp2_rcbuf.lo nghttp2_extpri.lo nghttp2_ratelim.lo \
161+
nghttp2_time.lo nghttp2_debug.lo sfparse.lo
161162
am_libnghttp2_la_OBJECTS = $(am__objects_1) $(am__objects_2)
162163
libnghttp2_la_OBJECTS = $(am_libnghttp2_la_OBJECTS)
163164
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -182,21 +183,22 @@ am__v_at_1 =
182183
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
183184
depcomp = $(SHELL) $(top_srcdir)/depcomp
184185
am__maybe_remake_depfiles = depfiles
185-
am__depfiles_remade = ./$(DEPDIR)/nghttp2_buf.Plo \
186-
./$(DEPDIR)/nghttp2_callbacks.Plo \
186+
am__depfiles_remade = ./$(DEPDIR)/nghttp2_alpn.Plo \
187+
./$(DEPDIR)/nghttp2_buf.Plo ./$(DEPDIR)/nghttp2_callbacks.Plo \
187188
./$(DEPDIR)/nghttp2_debug.Plo ./$(DEPDIR)/nghttp2_extpri.Plo \
188189
./$(DEPDIR)/nghttp2_frame.Plo ./$(DEPDIR)/nghttp2_hd.Plo \
189190
./$(DEPDIR)/nghttp2_hd_huffman.Plo \
190191
./$(DEPDIR)/nghttp2_hd_huffman_data.Plo \
191192
./$(DEPDIR)/nghttp2_helper.Plo ./$(DEPDIR)/nghttp2_http.Plo \
192193
./$(DEPDIR)/nghttp2_map.Plo ./$(DEPDIR)/nghttp2_mem.Plo \
193-
./$(DEPDIR)/nghttp2_npn.Plo ./$(DEPDIR)/nghttp2_option.Plo \
194+
./$(DEPDIR)/nghttp2_option.Plo \
194195
./$(DEPDIR)/nghttp2_outbound_item.Plo \
195196
./$(DEPDIR)/nghttp2_pq.Plo \
196197
./$(DEPDIR)/nghttp2_priority_spec.Plo \
197-
./$(DEPDIR)/nghttp2_queue.Plo ./$(DEPDIR)/nghttp2_rcbuf.Plo \
198-
./$(DEPDIR)/nghttp2_session.Plo ./$(DEPDIR)/nghttp2_stream.Plo \
199-
./$(DEPDIR)/nghttp2_submit.Plo ./$(DEPDIR)/nghttp2_version.Plo \
198+
./$(DEPDIR)/nghttp2_queue.Plo ./$(DEPDIR)/nghttp2_ratelim.Plo \
199+
./$(DEPDIR)/nghttp2_rcbuf.Plo ./$(DEPDIR)/nghttp2_session.Plo \
200+
./$(DEPDIR)/nghttp2_stream.Plo ./$(DEPDIR)/nghttp2_submit.Plo \
201+
./$(DEPDIR)/nghttp2_time.Plo ./$(DEPDIR)/nghttp2_version.Plo \
200202
./$(DEPDIR)/sfparse.Plo
201203
am__mv = mv -f
202204
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -304,8 +306,6 @@ CPP = @CPP@
304306
CPPFLAGS = @CPPFLAGS@
305307
CSCOPE = @CSCOPE@
306308
CTAGS = @CTAGS@
307-
CUNIT_CFLAGS = @CUNIT_CFLAGS@
308-
CUNIT_LIBS = @CUNIT_LIBS@
309309
CXX = @CXX@
310310
CXX1XCXXFLAGS = @CXX1XCXXFLAGS@
311311
CXXCPP = @CXXCPP@
@@ -329,7 +329,7 @@ EXTRA_DEFS = @EXTRA_DEFS@
329329
FGREP = @FGREP@
330330
FILECMD = @FILECMD@
331331
GREP = @GREP@
332-
HAVE_CXX14 = @HAVE_CXX14@
332+
HAVE_CXX20 = @HAVE_CXX20@
333333
INSTALL = @INSTALL@
334334
INSTALL_DATA = @INSTALL_DATA@
335335
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -343,6 +343,10 @@ LD = @LD@
343343
LDFLAGS = @LDFLAGS@
344344
LIBBPF_CFLAGS = @LIBBPF_CFLAGS@
345345
LIBBPF_LIBS = @LIBBPF_LIBS@
346+
LIBBROTLIDEC_CFLAGS = @LIBBROTLIDEC_CFLAGS@
347+
LIBBROTLIDEC_LIBS = @LIBBROTLIDEC_LIBS@
348+
LIBBROTLIENC_CFLAGS = @LIBBROTLIENC_CFLAGS@
349+
LIBBROTLIENC_LIBS = @LIBBROTLIENC_LIBS@
346350
LIBCARES_CFLAGS = @LIBCARES_CFLAGS@
347351
LIBCARES_LIBS = @LIBCARES_LIBS@
348352
LIBEVENT_OPENSSL_CFLAGS = @LIBEVENT_OPENSSL_CFLAGS@
@@ -358,6 +362,8 @@ LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
358362
LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
359363
LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
360364
LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
365+
LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS = @LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS@
366+
LIBNGTCP2_CRYPTO_WOLFSSL_LIBS = @LIBNGTCP2_CRYPTO_WOLFSSL_LIBS@
361367
LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
362368
LIBOBJS = @LIBOBJS@
363369
LIBS = @LIBS@
@@ -411,6 +417,8 @@ TESTLDADD = @TESTLDADD@
411417
VERSION = @VERSION@
412418
WARNCFLAGS = @WARNCFLAGS@
413419
WARNCXXFLAGS = @WARNCXXFLAGS@
420+
WOLFSSL_CFLAGS = @WOLFSSL_CFLAGS@
421+
WOLFSSL_LIBS = @WOLFSSL_LIBS@
414422
ZLIB_CFLAGS = @ZLIB_CFLAGS@
415423
ZLIB_LIBS = @ZLIB_LIBS@
416424
abs_builddir = @abs_builddir@
@@ -500,7 +508,7 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
500508
nghttp2_stream.c nghttp2_outbound_item.c \
501509
nghttp2_session.c nghttp2_submit.c \
502510
nghttp2_helper.c \
503-
nghttp2_npn.c \
511+
nghttp2_alpn.c \
504512
nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c \
505513
nghttp2_version.c \
506514
nghttp2_priority_spec.c \
@@ -510,14 +518,16 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
510518
nghttp2_http.c \
511519
nghttp2_rcbuf.c \
512520
nghttp2_extpri.c \
521+
nghttp2_ratelim.c \
522+
nghttp2_time.c \
513523
nghttp2_debug.c \
514524
sfparse.c
515525

516526
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
517527
nghttp2_frame.h \
518528
nghttp2_buf.h \
519529
nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
520-
nghttp2_npn.h \
530+
nghttp2_alpn.h \
521531
nghttp2_submit.h nghttp2_outbound_item.h \
522532
nghttp2_net.h \
523533
nghttp2_hd.h nghttp2_hd_huffman.h \
@@ -528,6 +538,8 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
528538
nghttp2_http.h \
529539
nghttp2_rcbuf.h \
530540
nghttp2_extpri.h \
541+
nghttp2_ratelim.h \
542+
nghttp2_time.h \
531543
nghttp2_debug.h \
532544
sfparse.h
533545

@@ -615,6 +627,7 @@ mostlyclean-compile:
615627
distclean-compile:
616628
-rm -f *.tab.c
617629

630+
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_alpn.Plo@am__quote@ # am--include-marker
618631
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_buf.Plo@am__quote@ # am--include-marker
619632
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_callbacks.Plo@am__quote@ # am--include-marker
620633
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_debug.Plo@am__quote@ # am--include-marker
@@ -627,16 +640,17 @@ distclean-compile:
627640
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_http.Plo@am__quote@ # am--include-marker
628641
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_map.Plo@am__quote@ # am--include-marker
629642
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_mem.Plo@am__quote@ # am--include-marker
630-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_npn.Plo@am__quote@ # am--include-marker
631643
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_option.Plo@am__quote@ # am--include-marker
632644
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_outbound_item.Plo@am__quote@ # am--include-marker
633645
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_pq.Plo@am__quote@ # am--include-marker
634646
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_priority_spec.Plo@am__quote@ # am--include-marker
635647
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_queue.Plo@am__quote@ # am--include-marker
648+
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_ratelim.Plo@am__quote@ # am--include-marker
636649
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_rcbuf.Plo@am__quote@ # am--include-marker
637650
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_session.Plo@am__quote@ # am--include-marker
638651
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_stream.Plo@am__quote@ # am--include-marker
639652
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_submit.Plo@am__quote@ # am--include-marker
653+
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_time.Plo@am__quote@ # am--include-marker
640654
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghttp2_version.Plo@am__quote@ # am--include-marker
641655
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfparse.Plo@am__quote@ # am--include-marker
642656

@@ -898,7 +912,8 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
898912
mostlyclean-am
899913

900914
distclean: distclean-recursive
901-
-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
915+
-rm -f ./$(DEPDIR)/nghttp2_alpn.Plo
916+
-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
902917
-rm -f ./$(DEPDIR)/nghttp2_callbacks.Plo
903918
-rm -f ./$(DEPDIR)/nghttp2_debug.Plo
904919
-rm -f ./$(DEPDIR)/nghttp2_extpri.Plo
@@ -910,16 +925,17 @@ distclean: distclean-recursive
910925
-rm -f ./$(DEPDIR)/nghttp2_http.Plo
911926
-rm -f ./$(DEPDIR)/nghttp2_map.Plo
912927
-rm -f ./$(DEPDIR)/nghttp2_mem.Plo
913-
-rm -f ./$(DEPDIR)/nghttp2_npn.Plo
914928
-rm -f ./$(DEPDIR)/nghttp2_option.Plo
915929
-rm -f ./$(DEPDIR)/nghttp2_outbound_item.Plo
916930
-rm -f ./$(DEPDIR)/nghttp2_pq.Plo
917931
-rm -f ./$(DEPDIR)/nghttp2_priority_spec.Plo
918932
-rm -f ./$(DEPDIR)/nghttp2_queue.Plo
933+
-rm -f ./$(DEPDIR)/nghttp2_ratelim.Plo
919934
-rm -f ./$(DEPDIR)/nghttp2_rcbuf.Plo
920935
-rm -f ./$(DEPDIR)/nghttp2_session.Plo
921936
-rm -f ./$(DEPDIR)/nghttp2_stream.Plo
922937
-rm -f ./$(DEPDIR)/nghttp2_submit.Plo
938+
-rm -f ./$(DEPDIR)/nghttp2_time.Plo
923939
-rm -f ./$(DEPDIR)/nghttp2_version.Plo
924940
-rm -f ./$(DEPDIR)/sfparse.Plo
925941
-rm -f Makefile
@@ -967,7 +983,8 @@ install-ps-am:
967983
installcheck-am:
968984

969985
maintainer-clean: maintainer-clean-recursive
970-
-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
986+
-rm -f ./$(DEPDIR)/nghttp2_alpn.Plo
987+
-rm -f ./$(DEPDIR)/nghttp2_buf.Plo
971988
-rm -f ./$(DEPDIR)/nghttp2_callbacks.Plo
972989
-rm -f ./$(DEPDIR)/nghttp2_debug.Plo
973990
-rm -f ./$(DEPDIR)/nghttp2_extpri.Plo
@@ -979,16 +996,17 @@ maintainer-clean: maintainer-clean-recursive
979996
-rm -f ./$(DEPDIR)/nghttp2_http.Plo
980997
-rm -f ./$(DEPDIR)/nghttp2_map.Plo
981998
-rm -f ./$(DEPDIR)/nghttp2_mem.Plo
982-
-rm -f ./$(DEPDIR)/nghttp2_npn.Plo
983999
-rm -f ./$(DEPDIR)/nghttp2_option.Plo
9841000
-rm -f ./$(DEPDIR)/nghttp2_outbound_item.Plo
9851001
-rm -f ./$(DEPDIR)/nghttp2_pq.Plo
9861002
-rm -f ./$(DEPDIR)/nghttp2_priority_spec.Plo
9871003
-rm -f ./$(DEPDIR)/nghttp2_queue.Plo
1004+
-rm -f ./$(DEPDIR)/nghttp2_ratelim.Plo
9881005
-rm -f ./$(DEPDIR)/nghttp2_rcbuf.Plo
9891006
-rm -f ./$(DEPDIR)/nghttp2_session.Plo
9901007
-rm -f ./$(DEPDIR)/nghttp2_stream.Plo
9911008
-rm -f ./$(DEPDIR)/nghttp2_submit.Plo
1009+
-rm -f ./$(DEPDIR)/nghttp2_time.Plo
9921010
-rm -f ./$(DEPDIR)/nghttp2_version.Plo
9931011
-rm -f ./$(DEPDIR)/sfparse.Plo
9941012
-rm -f Makefile

‎3rdparty/exported/nghttp2/Makefile.msvc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ NGHTTP2_SRC := nghttp2_pq.c \
7474
nghttp2_session.c \
7575
nghttp2_submit.c \
7676
nghttp2_helper.c \
77-
nghttp2_npn.c \
77+
nghttp2_alpn.c \
7878
nghttp2_hd.c \
7979
nghttp2_hd_huffman.c \
8080
nghttp2_hd_huffman_data.c \

0 commit comments

Comments
 (0)