From a66490101e23a71e214ed4a67051b00b46c0adfc Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Sun, 28 Jan 2018 20:26:07 +0800 Subject: curl enable http2, use nghttp2 --- ports/curl/CONTROL | 4 ++-- ports/curl/portfile.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 450f43d59..6db37600a 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.58.0 -Build-Depends: zlib, openssl, libssh2 +Version: 7.58.0-1 +Build-Depends: zlib, openssl, libssh2, nghttp2 Description: A library for transferring data with URLs # For WINSSL create target triplet which contains set(CURL_USE_WINSSL ON) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 64001704a..4516793a2 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -48,6 +48,7 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DBUILD_CURL_EXE=OFF -DENABLE_MANUAL=OFF + -DUSE_NGHTTP2=ON -DCURL_STATICLIB=${CURL_STATICLIB} -DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL} -- cgit v1.2.3 From b45bc185423e66cee437a6c1e46ddbb0932e4d00 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Sun, 28 Jan 2018 23:26:48 +0800 Subject: curl: only dynamic build support HTTP2 --- ports/curl/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 4516793a2..7752dd795 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -14,8 +14,12 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch ) +SET(HTTP2_OPTIONS) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) SET(CURL_STATICLIB OFF) + SET(HTTP2_OPTIONS + -DUSE_NGHTTP2=ON + ) else() SET(CURL_STATICLIB ON) endif() @@ -45,10 +49,10 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${UWP_OPTIONS} + ${HTTP2_OPTIONS} -DBUILD_TESTING=OFF -DBUILD_CURL_EXE=OFF -DENABLE_MANUAL=OFF - -DUSE_NGHTTP2=ON -DCURL_STATICLIB=${CURL_STATICLIB} -DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL} -- cgit v1.2.3 From e6712779e7a0c8f34ed581131d80a639b28448a7 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Sun, 28 Jan 2018 23:33:38 +0800 Subject: curl: disable WindowsStore HTTP2 support (nghttp2 not support) --- ports/curl/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 7752dd795..d397525c6 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -38,6 +38,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -DENABLE_IPV6=OFF -DENABLE_UNIX_SOCKETS=OFF ) + set(HTTP2_OPTIONS) ## disable curl HTTP2 support endif() vcpkg_find_acquire_program(PERL) -- cgit v1.2.3 From 278ab50c3f0e14555c0fc33d7d10a2b8fa239041 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Mon, 29 Jan 2018 12:40:16 +0800 Subject: CURL_USE_WINSSL disable HTTP2 --- ports/curl/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index d397525c6..f45ee8016 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -28,6 +28,7 @@ set(USE_OPENSSL ON) if(CURL_USE_WINSSL) set(USE_OPENSSL OFF) set(USE_WINSSL ON) + set(HTTP2_OPTIONS) ## disable HTTP2 when CURL_USE_WINSSL endif() set(UWP_OPTIONS) -- cgit v1.2.3 From 108d13a27780147f788036bf56f01148768289d2 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Tue, 30 Jan 2018 21:22:53 +0800 Subject: update about HTTP2 TLS --- ports/curl/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index f45ee8016..b13cdb309 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch ) +# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. SET(HTTP2_OPTIONS) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) SET(CURL_STATICLIB OFF) -- cgit v1.2.3