diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-05-05 17:08:21 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-05-13 08:17:09 +0200 |
| commit | ae4adae954c958f1e3b45e6759fec6095137b23c (patch) | |
| tree | a1c13daf53adb8019bfa4c51c9e69f8c910db94e | |
| parent | 52dfab65d6822d1281bb62ebc5c46cd2b7501487 (diff) | |
| download | curl-ae4adae954c958f1e3b45e6759fec6095137b23c.tar.gz | |
doh: CURL_DISABLE_DOH
| -rw-r--r-- | lib/doh.c | 4 | ||||
| -rw-r--r-- | lib/doh.h | 10 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
3 files changed, 15 insertions, 1 deletions
@@ -22,6 +22,8 @@ #include "curl_setup.h" +#ifndef CURL_DISABLE_DOH + #include "urldata.h" #include "curl_addrinfo.h" #include "doh.h" @@ -960,3 +962,5 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn, return CURLE_OK; } + +#endif /* CURL_DISABLE_DOH */ @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -25,6 +25,8 @@ #include "urldata.h" #include "curl_addrinfo.h" +#ifndef CURL_DISABLE_DOH + /* * Curl_doh() resolve a name using DoH (DNS-over-HTTPS). It resolves a name * and returns a 'Curl_addrinfo *' with the address information. @@ -102,4 +104,10 @@ DOHcode doh_decode(unsigned char *doh, struct dohentry *d); void de_cleanup(struct dohentry *d); #endif + +#else /* if DOH is disabled */ +#define Curl_doh(a,b,c,d) NULL +#define Curl_doh_is_resolved(x,y) CURLE_COULDNT_RESOLVE_HOST +#endif + #endif /* HEADER_CURL_DOH_H */ diff --git a/lib/urldata.h b/lib/urldata.h index 608b675df..af745f9d1 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -604,7 +604,9 @@ struct SingleRequest { char *upload_fromhere; void *protop; /* Allocated protocol-specific data. Each protocol handler makes sure this points to data it needs. */ +#ifndef CURL_DISABLE_DOH struct dohdata doh; /* DoH specific data for this request */ +#endif bit header:1; /* incoming data has HTTP header */ bit content_range:1; /* set TRUE if Content-Range: was found */ bit upload_done:1; /* set to TRUE when doing chunked transfer-encoding |