diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-09-06 09:16:02 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-09-06 09:17:17 +0200 |
| commit | abff183387ae7e4a0bb7cbdd653ff64aeb1840a7 (patch) | |
| tree | 8a02613ee4ac2ac53a9109f3715a8a4de5dd5a40 /include/curl | |
| parent | 3f3b26d6feb0667714902e836af608094235fca2 (diff) | |
| download | curl-abff183387ae7e4a0bb7cbdd653ff64aeb1840a7.tar.gz | |
setopt: add CURLOPT_DOH_URL
Closes #2668
Diffstat (limited to 'include/curl')
| -rw-r--r-- | include/curl/curl.h | 3 | ||||
| -rw-r--r-- | include/curl/typecheck-gcc.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 767cb3b17..627cf5446 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1859,6 +1859,9 @@ typedef enum { /* Disallow specifying username/login in URL. */ CINIT(DISALLOW_USERNAME_IN_URL, LONG, 278), + /* DNS-over-HTTPS URL */ + CINIT(DOH_URL, STRINGPOINT, 279), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h index a6f638614..244336204 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/curl/typecheck-gcc.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -269,6 +269,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t, (option) == CURLOPT_DNS_LOCAL_IP4 || \ (option) == CURLOPT_DNS_LOCAL_IP6 || \ (option) == CURLOPT_DNS_SERVERS || \ + (option) == CURLOPT_DOH_URL || \ (option) == CURLOPT_EGDSOCKET || \ (option) == CURLOPT_FTPPORT || \ (option) == CURLOPT_FTP_ACCOUNT || \ @@ -500,7 +501,8 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t, /* evaluates to true if expr can be passed as POST data (void* or char*) */ #define _curl_is_postfields(expr) \ (_curl_is_ptr((expr), void) || \ - _curl_is_arr((expr), char)) + _curl_is_arr((expr), char) || \ + _curl_is_arr((expr), unsigned char)) /* FIXME: the whole callback checking is messy... * The idea is to tolerate char vs. void and const vs. not const |