Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ff5bd04

Browse filesBrowse files
targosdanielleadams
authored andcommitted
deps: update nghttp2 to 1.42.0
Refs: https://github.com/nghttp2/nghttp2/releases/tag/v1.42.0 PR-URL: #36842 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent cfdbb79 commit ff5bd04
Copy full SHA for ff5bd04

File tree

Expand file treeCollapse file tree

15 files changed

+3109
-78
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

15 files changed

+3109
-78
lines changed
Open diff view settings
Collapse file

‎deps/nghttp2/lib/CMakeLists.txt‎

Copy file name to clipboard
+77Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
add_subdirectory(includes)
2+
3+
include_directories(
4+
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
5+
"${CMAKE_CURRENT_BINARY_DIR}/includes"
6+
)
7+
8+
add_definitions(-DBUILDING_NGHTTP2)
9+
10+
set(NGHTTP2_SOURCES
11+
nghttp2_pq.c nghttp2_map.c nghttp2_queue.c
12+
nghttp2_frame.c
13+
nghttp2_buf.c
14+
nghttp2_stream.c nghttp2_outbound_item.c
15+
nghttp2_session.c nghttp2_submit.c
16+
nghttp2_helper.c
17+
nghttp2_npn.c
18+
nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c
19+
nghttp2_version.c
20+
nghttp2_priority_spec.c
21+
nghttp2_option.c
22+
nghttp2_callbacks.c
23+
nghttp2_mem.c
24+
nghttp2_http.c
25+
nghttp2_rcbuf.c
26+
nghttp2_debug.c
27+
nghttp2_ksl.c
28+
)
29+
30+
set(NGHTTP2_RES "")
31+
32+
if(WIN32)
33+
configure_file(
34+
version.rc.in
35+
${CMAKE_CURRENT_BINARY_DIR}/version.rc
36+
@ONLY)
37+
38+
set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
39+
endif()
40+
41+
# Public shared library
42+
if(ENABLE_SHARED_LIB)
43+
add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
44+
set_target_properties(nghttp2 PROPERTIES
45+
COMPILE_FLAGS "${WARNCFLAGS}"
46+
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
47+
C_VISIBILITY_PRESET hidden
48+
)
49+
target_include_directories(nghttp2 INTERFACE
50+
"${CMAKE_CURRENT_BINARY_DIR}/includes"
51+
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
52+
)
53+
54+
install(TARGETS nghttp2
55+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
56+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
57+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
58+
endif()
59+
60+
if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
61+
# Static library (for unittests because of symbol visibility)
62+
add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
63+
set_target_properties(nghttp2_static PROPERTIES
64+
COMPILE_FLAGS "${WARNCFLAGS}"
65+
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
66+
ARCHIVE_OUTPUT_NAME nghttp2${STATIC_LIB_SUFFIX}
67+
)
68+
target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
69+
if(ENABLE_STATIC_LIB)
70+
install(TARGETS nghttp2_static
71+
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
72+
endif()
73+
endif()
74+
75+
76+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
77+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
Collapse file

‎deps/nghttp2/lib/Makefile.am‎

Copy file name to clipboardExpand all lines: deps/nghttp2/lib/Makefile.am
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
4949
nghttp2_mem.c \
5050
nghttp2_http.c \
5151
nghttp2_rcbuf.c \
52-
nghttp2_debug.c
52+
nghttp2_debug.c \
53+
nghttp2_ksl.c
5354

5455
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
5556
nghttp2_frame.h \
@@ -65,7 +66,8 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
6566
nghttp2_mem.h \
6667
nghttp2_http.h \
6768
nghttp2_rcbuf.h \
68-
nghttp2_debug.h
69+
nghttp2_debug.h \
70+
nghttp2_ksl.h
6971

7072
libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
7173
libnghttp2_la_LDFLAGS = -no-undefined \

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.