Skip to content

Commit f5f321a

Browse files
committed
Add more options to curl
- CURLOPT_ECH - CURLOPT_HAPROXY_CLIENT_IP - CURLOPT_SERVER_RESPONSE_TIMEOUT_MS - CURLOPT_MAIL_RCPT_ALLLOWFAILS is renamed to CURLOPT_MAIL_RCPT_ALLOWFAILS
1 parent 5be4de1 commit f5f321a

3 files changed

Lines changed: 86 additions & 4 deletions

File tree

‎ext/curl/curl.stub.php‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@
7777
* @cvalue CURLOPT_DNS_USE_GLOBAL_CACHE
7878
*/
7979
const CURLOPT_DNS_USE_GLOBAL_CACHE = UNKNOWN;
80+
#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */
81+
/**
82+
* @var int
83+
* @cvalue CURLOPT_ECH
84+
*/
85+
const CURLOPT_ECH = UNKNOWN;
86+
#endif
8087
/**
8188
* @var int
8289
* @cvalue CURLOPT_EGDSOCKET
@@ -143,6 +150,13 @@
143150
* @cvalue CURLOPT_FTP_USE_EPSV
144151
*/
145152
const CURLOPT_FTP_USE_EPSV = UNKNOWN;
153+
#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */
154+
/**
155+
* @var int
156+
* @cvalue CURLOPT_HAPROXY_CLIENT_IP
157+
*/
158+
const CURLOPT_HAPROXY_CLIENT_IP = UNKNOWN;
159+
#endif
146160
/**
147161
* @var int
148162
* @cvalue CURLOPT_HEADER
@@ -1383,6 +1397,13 @@
13831397
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
13841398
*/
13851399
const CURLOPT_SERVER_RESPONSE_TIMEOUT = UNKNOWN;
1400+
#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */
1401+
/**
1402+
* @var int
1403+
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT_MS
1404+
*/
1405+
const CURLOPT_SERVER_RESPONSE_TIMEOUT_MS = UNKNOWN;
1406+
#endif
13861407
/**
13871408
* @var int
13881409
* @cvalue CURLOPT_IPRESOLVE
@@ -3277,11 +3298,29 @@
32773298
#endif
32783299

32793300
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
3301+
# if LIBCURL_VERSION_NUM >= 0x080200 /* renamed in 8.2.0 */
3302+
/**
3303+
* @var int
3304+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
3305+
*/
3306+
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
3307+
/**
3308+
* @var int
3309+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
3310+
*/
3311+
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
3312+
# else
3313+
/**
3314+
* @var int
3315+
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
3316+
*/
3317+
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
32803318
/**
32813319
* @var int
32823320
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
32833321
*/
32843322
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
3323+
# endif
32853324
#endif
32863325

32873326
#if LIBCURL_VERSION_NUM >= 0x074600 /* Available since 7.70.0 */

‎ext/curl/curl_arginfo.h‎

Lines changed: 37 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/curl/interface.c‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18161816
case CURLOPT_MAXAGE_CONN:
18171817
#endif
18181818
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
1819-
case CURLOPT_MAIL_RCPT_ALLLOWFAILS:
1819+
case CURLOPT_MAIL_RCPT_ALLOWFAILS:
18201820
#endif
18211821
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
18221822
case CURLOPT_HSTS_CTRL:
@@ -1839,6 +1839,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18391839
case CURLOPT_CA_CACHE_TIMEOUT:
18401840
case CURLOPT_QUICK_EXIT:
18411841
#endif
1842+
#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */
1843+
case CURLOPT_SERVER_RESPONSE_TIMEOUT_MS:
1844+
#endif
18421845
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
18431846
case CURLOPT_TCP_KEEPCNT:
18441847
#endif
@@ -1935,6 +1938,12 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
19351938
#if LIBCURL_VERSION_NUM >= 0x075500 /* Available since 7.85.0 */
19361939
case CURLOPT_PROTOCOLS_STR:
19371940
case CURLOPT_REDIR_PROTOCOLS_STR:
1941+
#endif
1942+
#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */
1943+
case CURLOPT_HAPROXY_CLIENT_IP:
1944+
#endif
1945+
#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */
1946+
case CURLOPT_ECH:
19381947
#endif
19391948
{
19401949
zend_string *tmp_str;

0 commit comments

Comments
 (0)