summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2019-02-22 15:42:20 +0800
committerzhengchao <[email protected]>2019-05-24 18:45:44 +0800
commit10c0ef7b762799987eb713b66b4b694155f969fc (patch)
treea753030e3e3ca1052675523725843ae9bc69c647 /vendor
parentfcb1581a1ccf931a41e880d921cbee2d5db99aa1 (diff)
*由于git rebase冲突删除原tfe-new-http2分支
*提交包括http2数据替换,转发,截断,缓存代码 *合并最新develop-tfe3a后,http2验证代码提交 *http2重构验证代码提交 *http2添加br压缩解压缩接口和测试用例 *http2定时删除session信息代码提交 *修复bug,访问二级链接时由于nghttp2库收到control ping后,自发control ping包 造成链接断开后重连现象 *修复bug, 链接建立后服务端优先发送control包,未处理此数据包,造成页面访问失败
Diffstat (limited to 'vendor')
-rw-r--r--vendor/CMakeLists.txt6
-rw-r--r--vendor/nghttp2-1.24.0.tar.gzbin0 -> 2208363 bytes
-rw-r--r--vendor/nghttp2-1.32.0.tar.gzbin2216104 -> 0 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 3d38e47..9ea9efc 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -80,8 +80,8 @@ set_property(TARGET http-parser-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${
### nghttp2
ExternalProject_Add(nghttp2
PREFIX nghttp2
- URL ${CMAKE_CURRENT_SOURCE_DIR}/nghttp2-1.32.0.tar.gz
- URL_MD5 35944dff48a2d823774c9ed15344d25b
+ URL ${CMAKE_CURRENT_SOURCE_DIR}/nghttp2-1.24.0.tar.gz
+ URL_MD5 d3bf46ac99772d39fa60fa8fd2ab91e5
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --disable-shared
BUILD_IN_SOURCE 1)
@@ -91,7 +91,7 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
add_library(nghttp2-static STATIC IMPORTED GLOBAL)
add_dependencies(nghttp2-static nghttp2)
set_property(TARGET nghttp2-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libnghttp2.a)
-set_property(TARGET nghttp2-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+set_property(TARGET nghttp2-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include ${INSTALL_DIR}/src/nghttp2/lib)
#### GoogleTest
ExternalProject_Add(googletest PREFIX googletest
diff --git a/vendor/nghttp2-1.24.0.tar.gz b/vendor/nghttp2-1.24.0.tar.gz
new file mode 100644
index 0000000..05af0e1
--- /dev/null
+++ b/vendor/nghttp2-1.24.0.tar.gz
Binary files differ
diff --git a/vendor/nghttp2-1.32.0.tar.gz b/vendor/nghttp2-1.32.0.tar.gz
deleted file mode 100644
index 582eabb..0000000
--- a/vendor/nghttp2-1.32.0.tar.gz
+++ /dev/null
Binary files differ