aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-12-03 11:51:52 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-12-05 23:44:26 +0100
commit027d66e5f1b6946257ecf3bca2d4983579e461cf (patch)
tree1d8d1f149ee4e126540f5b206deb7fe813aa9027
parentbae0d473f5912d38fc8da1f9850a70b015b53c9e (diff)
doh: make it work for h2-disabled builds too
Reported-by: dtmsecurity at github Fixes #3325 Closes #3336
-rw-r--r--lib/doh.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/lib/doh.c b/lib/doh.c
index 24546a0ac..e2cabb450 100644
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -26,7 +26,6 @@
#include "curl_addrinfo.h"
#include "doh.h"
-#ifdef USE_NGHTTP2
#include "sendf.h"
#include "multiif.h"
#include "url.h"
@@ -234,7 +233,9 @@ static CURLcode dohprobe(struct Curl_easy *data,
ERROR_CHECK_SETOPT(CURLOPT_POSTFIELDSIZE, (long)p->dohlen);
}
ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers);
+#ifdef USE_NGHTTP2
ERROR_CHECK_SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
+#endif
#ifndef CURLDEBUG
/* enforce HTTPS if not debug */
ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
@@ -893,28 +894,3 @@ 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 */