]> granicus.if.org Git - curl/commitdiff
doh: only build if h2 enabled
authorDaniel Stenberg <daniel@haxx.se>
Sat, 29 Sep 2018 12:08:29 +0000 (14:08 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 30 Sep 2018 09:31:58 +0000 (11:31 +0200)
The DoH spec says "HTTP/2 [RFC7540] is the minimum RECOMMENDED version
of HTTP for use with DoH".

Reported-by: Marcel Raad
Closes #3066

lib/doh.c

index 70ffede358c99cae24653fc964d0cc63e3fce414..988f352180fce6b0e3ecac62057959afacdde646 100644 (file)
--- a/lib/doh.c
+++ b/lib/doh.c
  ***************************************************************************/
 
 #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 */