Skip to content

Commit 43f9d39

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 d37a820 commit 43f9d39

3 files changed

Lines changed: 67 additions & 3 deletions

File tree

ext/curl/curl.stub.php

Lines changed: 41 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
@@ -3272,11 +3293,31 @@
32723293
#endif
32733294

32743295
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
3296+
# if LIBCURL_VERSION_NUM >= 0x080200 /* renamed in 8.2.0 */
3297+
/**
3298+
* @var int
3299+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
3300+
*/
3301+
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
3302+
/**
3303+
* @var int
3304+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
3305+
*/
3306+
#[\Deprecated(since: '8.7', message: 'renamed to CURLOPT_MAIL_RCPT_ALLOWFAILS')]
3307+
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
3308+
# else
3309+
/**
3310+
* @var int
3311+
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
3312+
*/
3313+
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
32753314
/**
32763315
* @var int
32773316
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
32783317
*/
3318+
#[\Deprecated(since: '8.7', message: 'renamed to CURLOPT_MAIL_RCPT_ALLOWFAILS')]
32793319
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
3320+
# endif
32803321
#endif
32813322

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

ext/curl/curl_arginfo.h

Lines changed: 16 additions & 2 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
@@ -1779,7 +1779,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
17791779
case CURLOPT_MAXAGE_CONN:
17801780
#endif
17811781
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
1782-
case CURLOPT_MAIL_RCPT_ALLLOWFAILS:
1782+
case CURLOPT_MAIL_RCPT_ALLOWFAILS:
17831783
#endif
17841784
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
17851785
case CURLOPT_HSTS_CTRL:
@@ -1802,6 +1802,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18021802
case CURLOPT_CA_CACHE_TIMEOUT:
18031803
case CURLOPT_QUICK_EXIT:
18041804
#endif
1805+
#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */
1806+
case CURLOPT_SERVER_RESPONSE_TIMEOUT_MS:
1807+
#endif
18051808
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
18061809
case CURLOPT_TCP_KEEPCNT:
18071810
#endif
@@ -1898,6 +1901,12 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18981901
#if LIBCURL_VERSION_NUM >= 0x075500 /* Available since 7.85.0 */
18991902
case CURLOPT_PROTOCOLS_STR:
19001903
case CURLOPT_REDIR_PROTOCOLS_STR:
1904+
#endif
1905+
#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */
1906+
case CURLOPT_HAPROXY_CLIENT_IP:
1907+
#endif
1908+
#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */
1909+
case CURLOPT_ECH:
19011910
#endif
19021911
{
19031912
zend_string *tmp_str;

0 commit comments

Comments
 (0)