From 3dad63b5b25fc27604a38964b3bea885cbfbf1d3 Mon Sep 17 00:00:00 2001 From: Ayesh Karunaratne Date: Mon, 18 Jan 2021 03:26:25 +0700 Subject: Curl: Add CURLOPT_DOH_URL option From libcurl version 7.62.0 and later, it supports DNS-over-HTTPS with [`CURLOPT_DOH_URL`](https://curl.se/libcurl/c/CURLOPT_DOH_URL.html) option. This adds integration with the `CURLOPT_DOH_URL` option if libcurl version is >= 7.62.0 (0x073E00). For reference, Ubuntu 20.04+ `libcurl4-openssl-dev`-based PHP builds use Curl 7.68. Closes GH-6612. --- ext/curl/interface.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ext/curl') diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 39f7b7e5d0..82f512d29d 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1141,6 +1141,10 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_TLS13_CIPHERS); #endif +#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */ + REGISTER_CURL_CONSTANT(CURLOPT_DOH_URL); +#endif + #if LIBCURL_VERSION_NUM >= 0x074000 /* Available since 7.64.0 */ REGISTER_CURL_CONSTANT(CURLOPT_HTTP09_ALLOWED); #endif @@ -2449,6 +2453,9 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue, bool i #endif #if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */ case CURLOPT_UNIX_SOCKET_PATH: +#endif +#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */ + case CURLOPT_DOH_URL: #endif case CURLOPT_KRBLEVEL: { -- cgit v1.2.1