mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:31:41 +03:00
vquic: drop msh3
It has never been properly functional in curl while there are several alternatives that are. Closes #17729
This commit is contained in:
parent
c4430c542a
commit
91138b014d
32 changed files with 22 additions and 1612 deletions
|
|
@ -1162,30 +1162,8 @@ if(USE_QUICHE)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
option(USE_MSH3 "Use msh3/msquic library for HTTP/3 support" OFF)
|
||||
if(USE_MSH3)
|
||||
if(USE_NGTCP2 OR USE_QUICHE)
|
||||
message(FATAL_ERROR "Only one HTTP/3 backend can be selected")
|
||||
endif()
|
||||
if(NOT WIN32)
|
||||
if(NOT USE_OPENSSL)
|
||||
message(FATAL_ERROR "msh3/msquic requires OpenSSL fork with QUIC API")
|
||||
endif()
|
||||
curl_openssl_check_quic()
|
||||
endif()
|
||||
find_package(MSH3 REQUIRED)
|
||||
list(APPEND CURL_LIBS ${MSH3_LIBRARIES})
|
||||
list(APPEND CURL_LIBDIRS ${MSH3_LIBRARY_DIRS})
|
||||
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${MSH3_PC_REQUIRES})
|
||||
include_directories(SYSTEM ${MSH3_INCLUDE_DIRS})
|
||||
link_directories(${MSH3_LIBRARY_DIRS})
|
||||
if(MSH3_CFLAGS)
|
||||
string(APPEND CMAKE_C_FLAGS " ${MSH3_CFLAGS}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(USE_OPENSSL_QUIC)
|
||||
if(USE_NGTCP2 OR USE_QUICHE OR USE_MSH3)
|
||||
if(USE_NGTCP2 OR USE_QUICHE)
|
||||
message(FATAL_ERROR "Only one HTTP/3 backend can be selected")
|
||||
endif()
|
||||
find_package(OpenSSL 3.3.0 REQUIRED)
|
||||
|
|
@ -1202,7 +1180,7 @@ if(USE_OPENSSL_QUIC)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if(CURL_WITH_MULTI_SSL AND (USE_NGTCP2 OR USE_QUICHE OR USE_MSH3 OR USE_OPENSSL_QUIC))
|
||||
if(CURL_WITH_MULTI_SSL AND (USE_NGTCP2 OR USE_QUICHE OR USE_OPENSSL_QUIC))
|
||||
message(FATAL_ERROR "MultiSSL cannot be enabled with HTTP/3 and vice versa.")
|
||||
endif()
|
||||
|
||||
|
|
@ -2169,7 +2147,7 @@ curl_add_if("NTLM" NOT CURL_DISABLE_NTLM AND
|
|||
(_use_curl_ntlm_core OR USE_WINDOWS_SSPI))
|
||||
curl_add_if("TLS-SRP" USE_TLS_SRP)
|
||||
curl_add_if("HTTP2" USE_NGHTTP2)
|
||||
curl_add_if("HTTP3" USE_NGTCP2 OR USE_QUICHE OR USE_MSH3 OR USE_OPENSSL_QUIC)
|
||||
curl_add_if("HTTP3" USE_NGTCP2 OR USE_QUICHE OR USE_OPENSSL_QUIC)
|
||||
curl_add_if("MultiSSL" CURL_WITH_MULTI_SSL)
|
||||
curl_add_if("HTTPS-proxy" NOT CURL_DISABLE_PROXY AND _ssl_enabled AND (USE_OPENSSL OR USE_GNUTLS
|
||||
OR USE_SCHANNEL OR USE_RUSTLS OR USE_MBEDTLS OR
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue