mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
doh: make it work for h2-disabled builds too
Reported-by: dtmsecurity at github Fixes #3325 Closes #3336
This commit is contained in:
parent
bae0d473f5
commit
027d66e5f1
28
lib/doh.c
28
lib/doh.c
@ -26,7 +26,6 @@
|
|||||||
#include "curl_addrinfo.h"
|
#include "curl_addrinfo.h"
|
||||||
#include "doh.h"
|
#include "doh.h"
|
||||||
|
|
||||||
#ifdef USE_NGHTTP2
|
|
||||||
#include "sendf.h"
|
#include "sendf.h"
|
||||||
#include "multiif.h"
|
#include "multiif.h"
|
||||||
#include "url.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_POSTFIELDSIZE, (long)p->dohlen);
|
||||||
}
|
}
|
||||||
ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers);
|
ERROR_CHECK_SETOPT(CURLOPT_HTTPHEADER, headers);
|
||||||
|
#ifdef USE_NGHTTP2
|
||||||
ERROR_CHECK_SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
|
ERROR_CHECK_SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
|
||||||
|
#endif
|
||||||
#ifndef CURLDEBUG
|
#ifndef CURLDEBUG
|
||||||
/* enforce HTTPS if not debug */
|
/* enforce HTTPS if not debug */
|
||||||
ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
|
ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
|
||||||
@ -893,28 +894,3 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn,
|
|||||||
|
|
||||||
return CURLE_OK;
|
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 */
|
|
||||||
|
Loading…
Reference in New Issue
Block a user