diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php index 70e87cc9b146..50698cd39213 100644 --- a/ext/curl/curl.stub.php +++ b/ext/curl/curl.stub.php @@ -77,6 +77,13 @@ * @cvalue CURLOPT_DNS_USE_GLOBAL_CACHE */ const CURLOPT_DNS_USE_GLOBAL_CACHE = UNKNOWN; +#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */ +/** + * @var int + * @cvalue CURLOPT_ECH + */ +const CURLOPT_ECH = UNKNOWN; +#endif /** * @var int * @cvalue CURLOPT_EGDSOCKET @@ -143,6 +150,13 @@ * @cvalue CURLOPT_FTP_USE_EPSV */ const CURLOPT_FTP_USE_EPSV = UNKNOWN; +#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */ +/** + * @var int + * @cvalue CURLOPT_HAPROXY_CLIENT_IP + */ +const CURLOPT_HAPROXY_CLIENT_IP = UNKNOWN; +#endif /** * @var int * @cvalue CURLOPT_HEADER @@ -1383,6 +1397,13 @@ * @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT */ const CURLOPT_SERVER_RESPONSE_TIMEOUT = UNKNOWN; +#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */ +/** + * @var int + * @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT_MS + */ +const CURLOPT_SERVER_RESPONSE_TIMEOUT_MS = UNKNOWN; +#endif /** * @var int * @cvalue CURLOPT_IPRESOLVE @@ -3272,11 +3293,31 @@ #endif #if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */ +# if LIBCURL_VERSION_NUM >= 0x080200 /* renamed in 8.2.0 */ +/** + * @var int + * @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS + */ +const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN; +/** + * @var int + * @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS + */ +#[\Deprecated(since: '8.7', message: 'renamed to CURLOPT_MAIL_RCPT_ALLOWFAILS')] +const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN; +# else +/** + * @var int + * @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS + */ +const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN; /** * @var int * @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS */ +#[\Deprecated(since: '8.7', message: 'renamed to CURLOPT_MAIL_RCPT_ALLOWFAILS')] const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN; +# endif #endif #if LIBCURL_VERSION_NUM >= 0x074600 /* Available since 7.70.0 */ diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h index f2929f60c4e2..b8be8946530a 100644 --- a/ext/curl/curl_arginfo.h +++ b/ext/curl/curl_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit curl.stub.php instead. - * Stub hash: d55adb230c533f4dde05e95759477dd9e1dd6efb */ + * Stub hash: f55a7bda618f4a536e3ecd2debbe7759fe203378 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0) @@ -241,6 +241,9 @@ static void register_curl_symbols(int module_number) REGISTER_LONG_CONSTANT("CURLOPT_CUSTOMREQUEST", CURLOPT_CUSTOMREQUEST, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_DNS_CACHE_TIMEOUT", CURLOPT_DNS_CACHE_TIMEOUT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_DNS_USE_GLOBAL_CACHE", CURLOPT_DNS_USE_GLOBAL_CACHE, CONST_PERSISTENT); +#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */ + REGISTER_LONG_CONSTANT("CURLOPT_ECH", CURLOPT_ECH, CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("CURLOPT_EGDSOCKET", CURLOPT_EGDSOCKET, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_ENCODING", CURLOPT_ACCEPT_ENCODING, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_FAILONERROR", CURLOPT_FAILONERROR, CONST_PERSISTENT); @@ -254,6 +257,9 @@ static void register_curl_symbols(int module_number) REGISTER_LONG_CONSTANT("CURLOPT_FTPPORT", CURLOPT_FTPPORT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_FTP_USE_EPRT", CURLOPT_FTP_USE_EPRT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_FTP_USE_EPSV", CURLOPT_FTP_USE_EPSV, CONST_PERSISTENT); +#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */ + REGISTER_LONG_CONSTANT("CURLOPT_HAPROXY_CLIENT_IP", CURLOPT_HAPROXY_CLIENT_IP, CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("CURLOPT_HEADER", CURLOPT_HEADER, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_HEADERFUNCTION", CURLOPT_HEADERFUNCTION, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_HTTP200ALIASES", CURLOPT_HTTP200ALIASES, CONST_PERSISTENT); @@ -502,6 +508,9 @@ static void register_curl_symbols(int module_number) REGISTER_LONG_CONSTANT("CURLINFO_PROXYAUTH_AVAIL", CURLINFO_PROXYAUTH_AVAIL, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_FTP_RESPONSE_TIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_SERVER_RESPONSE_TIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, CONST_PERSISTENT); +#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */ + REGISTER_LONG_CONSTANT("CURLOPT_SERVER_RESPONSE_TIMEOUT_MS", CURLOPT_SERVER_RESPONSE_TIMEOUT_MS, CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("CURLOPT_IPRESOLVE", CURLOPT_IPRESOLVE, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_MAXFILESIZE", CURLOPT_MAXFILESIZE, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURL_IPRESOLVE_V4", CURL_IPRESOLVE_V4, CONST_PERSISTENT); @@ -873,7 +882,12 @@ static void register_curl_symbols(int module_number) #if LIBCURL_VERSION_NUM >= 0x074400 /* Available since 7.68.0 */ REGISTER_LONG_CONSTANT("CURLSSLOPT_NO_PARTIALCHAIN", CURLSSLOPT_NO_PARTIALCHAIN, CONST_PERSISTENT); #endif -#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */ +#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */ && LIBCURL_VERSION_NUM >= 0x080200 /* renamed in 8.2.0 */ + REGISTER_LONG_CONSTANT("CURLOPT_MAIL_RCPT_ALLOWFAILS", CURLOPT_MAIL_RCPT_ALLOWFAILS, CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CURLOPT_MAIL_RCPT_ALLLOWFAILS", CURLOPT_MAIL_RCPT_ALLOWFAILS, CONST_PERSISTENT); +#endif +#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */ && !(LIBCURL_VERSION_NUM >= 0x080200 /* renamed in 8.2.0 */) + REGISTER_LONG_CONSTANT("CURLOPT_MAIL_RCPT_ALLOWFAILS", CURLOPT_MAIL_RCPT_ALLLOWFAILS, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CURLOPT_MAIL_RCPT_ALLLOWFAILS", CURLOPT_MAIL_RCPT_ALLLOWFAILS, CONST_PERSISTENT); #endif #if LIBCURL_VERSION_NUM >= 0x074600 /* Available since 7.70.0 */ diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 2571eb60e42d..04be45df15cd 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1779,7 +1779,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue case CURLOPT_MAXAGE_CONN: #endif #if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */ - case CURLOPT_MAIL_RCPT_ALLLOWFAILS: + case CURLOPT_MAIL_RCPT_ALLOWFAILS: #endif #if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */ case CURLOPT_HSTS_CTRL: @@ -1802,6 +1802,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue case CURLOPT_CA_CACHE_TIMEOUT: case CURLOPT_QUICK_EXIT: #endif +#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */ + case CURLOPT_SERVER_RESPONSE_TIMEOUT_MS: +#endif #if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */ case CURLOPT_TCP_KEEPCNT: #endif @@ -1898,6 +1901,12 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue #if LIBCURL_VERSION_NUM >= 0x075500 /* Available since 7.85.0 */ case CURLOPT_PROTOCOLS_STR: case CURLOPT_REDIR_PROTOCOLS_STR: +#endif +#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */ + case CURLOPT_HAPROXY_CLIENT_IP: +#endif +#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */ + case CURLOPT_ECH: #endif { zend_string *tmp_str;