diff options
author | Daniel Stenberg <daniel@haxx.se> | 2018-12-03 11:51:52 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2018-12-03 11:51:52 +0100 |
commit | f5ad606986e548976651388dd228dbf74def2af5 (patch) | |
tree | e54a4701ed37cde574bf7cd795516420922c7cc4 | |
parent | 847b13024417ea42b0123fcdb33ce53bf12619f7 (diff) | |
download | curl-bagder/doh-for-h1.tar.gz |
doh: make it work for h2-disabled builds toobagder/doh-for-h1
Reported-by: dtmsecurity at github
Fixes #3325
-rw-r--r-- | lib/doh.c | 28 |
1 files changed, 2 insertions, 26 deletions
@@ -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 */ |