diff options
| author | Stefan Eissing <stefan@eissing.org> | 2023-03-23 09:39:37 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2023-03-23 15:39:13 +0100 |
| commit | 78f73f79ca0937745f8a6594dad9711749143801 (patch) | |
| tree | 03b6236a6ef75e9ea5a513664f9e3d6201af8811 /lib/vquic | |
| parent | 5ddd5f2619bd530e598d15c4af65d7b02eca34e1 (diff) | |
| download | curl-78f73f79ca0937745f8a6594dad9711749143801.tar.gz | |
ngtcp2: adjust config and code checks for ngtcp2 without nghttp3
- make configure show on HTTP3 feature that both ngtcp2 and nghttp3
are in play
- define ENABLE_QUIC only when USE_NGTCP2 and USE_NGHTTP3 are defined
- add USE_NGHTTP3 in the ngtcp2 implementation
Fixes #10793
Closes #10821
Diffstat (limited to 'lib/vquic')
| -rw-r--r-- | lib/vquic/curl_ngtcp2.c | 2 | ||||
| -rw-r--r-- | lib/vquic/curl_ngtcp2.h | 2 | ||||
| -rw-r--r-- | lib/vquic/vquic.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c index d2d0a3a5a..18c741c59 100644 --- a/lib/vquic/curl_ngtcp2.c +++ b/lib/vquic/curl_ngtcp2.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#ifdef USE_NGTCP2 +#if defined(USE_NGTCP2) && defined(USE_NGHTTP3) #include <ngtcp2/ngtcp2.h> #include <nghttp3/nghttp3.h> diff --git a/lib/vquic/curl_ngtcp2.h b/lib/vquic/curl_ngtcp2.h index 8813ec9a7..db3e611bd 100644 --- a/lib/vquic/curl_ngtcp2.h +++ b/lib/vquic/curl_ngtcp2.h @@ -26,7 +26,7 @@ #include "curl_setup.h" -#ifdef USE_NGTCP2 +#if defined(USE_NGTCP2) && defined(USE_NGHTTP3) #ifdef HAVE_NETINET_UDP_H #include <netinet/udp.h> diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c index bbdeabd69..87a45255e 100644 --- a/lib/vquic/vquic.c +++ b/lib/vquic/vquic.c @@ -53,7 +53,7 @@ void Curl_quic_ver(char *p, size_t len) { -#ifdef USE_NGTCP2 +#if defined(USE_NGTCP2) && defined(USE_NGHTTP3) Curl_ngtcp2_ver(p, len); #elif defined(USE_QUICHE) Curl_quiche_ver(p, len); @@ -330,7 +330,7 @@ CURLcode Curl_cf_quic_create(struct Curl_cfilter **pcf, { (void)transport; DEBUGASSERT(transport == TRNSPRT_QUIC); -#ifdef USE_NGTCP2 +#if defined(USE_NGTCP2) && defined(USE_NGHTTP3) return Curl_cf_ngtcp2_create(pcf, data, conn, ai); #elif defined(USE_QUICHE) return Curl_cf_quiche_create(pcf, data, conn, ai); @@ -349,7 +349,7 @@ bool Curl_conn_is_http3(const struct Curl_easy *data, const struct connectdata *conn, int sockindex) { -#ifdef USE_NGTCP2 +#if defined(USE_NGTCP2) && defined(USE_NGHTTP3) return Curl_conn_is_ngtcp2(data, conn, sockindex); #elif defined(USE_QUICHE) return Curl_conn_is_quiche(data, conn, sockindex); |