From 60d16ed79431d76534d5f4cc51ad5b70adb2cad5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 29 Sep 2018 14:08:29 +0200 Subject: doh: only build in support if h2 enabled The DoH spec says "HTTP/2 [RFC7540] is the minimum RECOMMENDED version of HTTP for use with DoH". Reported-by: Marcel Raad --- lib/doh.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/doh.c b/lib/doh.c index 70ffede35..988f35218 100644 --- a/lib/doh.c +++ b/lib/doh.c @@ -21,15 +21,18 @@ ***************************************************************************/ #include "curl_setup.h" + #include "urldata.h" #include "curl_addrinfo.h" +#include "doh.h" + +#ifdef USE_NGHTTP2 #include "sendf.h" #include "multiif.h" #include "url.h" #include "share.h" #include "curl_base64.h" #include "connect.h" -#include "doh.h" /* The last 3 #include files should be in this order */ #include "curl_printf.h" #include "curl_memory.h" @@ -878,3 +881,28 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn, return CURLE_OK; } + +#else /* !USE_NGHTTP2 */ +/* + */ +Curl_addrinfo *Curl_doh(struct connectdata *conn, + const char *hostname, + int port, + int *waitp) +{ + (void)conn; + (void)hostname; + (void)port; + (void)waitp; + return NULL; +} + +CURLcode Curl_doh_is_resolved(struct connectdata *conn, + struct Curl_dns_entry **dnsp) +{ + (void)conn; + (void)dnsp; + return CURLE_NOT_BUILT_IN; +} + +#endif /* USE_NGHTTP2 */ -- cgit v1.2.1