Skip to content

Commit 0b6bec7

Browse files
committed
ext/curl: 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 bc2d2fc commit 0b6bec7

5 files changed

Lines changed: 61 additions & 4 deletions

File tree

‎UPGRADING‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ PHP 8.7 UPGRADE NOTES
7474
- Curl:
7575
. Multiple files can now be uploaded with the same field name by passing an
7676
array of CURLFile or CURLStringFile objects to CURLOPT_POSTFIELDS.
77+
. Support for upstream options CURLOPT_ECH, CURLOPT_HAPROXY_CLIENT_IP, and
78+
CURLOPT_SERVER_RESPONSE_TIMEOUT_MS.
7779

7880
- Intl:
7981
. Added IntlRelativeDateTimeFormatter to format relative date and time offsets
@@ -165,6 +167,12 @@ PHP 8.7 UPGRADE NOTES
165167
10. New Global Constants
166168
========================================
167169

170+
- Curl:
171+
. New options: CURLOPT_ECH, CURLOPT_HAPROXY_CLIENT_IP,
172+
CURLOPT_SERVER_RESPONSE_TIMEOUT_MS.
173+
. CURLOPT_MAIL_RCPT_ALLOWFAILS is the correctly spelled alternative to
174+
CURLOPT_MAIL_RCPT_ALLLOWFAILS.
175+
168176
========================================
169177
11. Changes to INI File Handling
170178
========================================

‎ext/curl/curl.stub.php‎

Lines changed: 27 additions & 1 deletion
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
@@ -3279,7 +3300,12 @@
32793300
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
32803301
/**
32813302
* @var int
3282-
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
3303+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
3304+
*/
3305+
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
3306+
/**
3307+
* @var int
3308+
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
32833309
*/
32843310
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
32853311
#endif

‎ext/curl/curl_arginfo.h‎

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

‎ext/curl/curl_private.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
#include <curl/curl.h>
2727
#include <curl/multi.h>
2828

29+
#if LIBCURL_VERSION_NUM < 0x080200 /* Available since 8.2.0 */
30+
# define CURLOPT_MAIL_RCPT_ALLOWFAILS CURLOPT_MAIL_RCPT_ALLLOWFAILS
31+
#endif
32+
2933
#define CURLOPT_RETURNTRANSFER 19913
3034
#define CURLOPT_BINARYTRANSFER 19914 /* For Backward compatibility */
3135
#define PHP_CURL_STDOUT 0

‎ext/curl/interface.c‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18651865
case CURLOPT_MAXAGE_CONN:
18661866
#endif
18671867
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
1868-
case CURLOPT_MAIL_RCPT_ALLLOWFAILS:
1868+
case CURLOPT_MAIL_RCPT_ALLOWFAILS:
18691869
#endif
18701870
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
18711871
case CURLOPT_HSTS_CTRL:
@@ -1888,6 +1888,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
18881888
case CURLOPT_CA_CACHE_TIMEOUT:
18891889
case CURLOPT_QUICK_EXIT:
18901890
#endif
1891+
#if LIBCURL_VERSION_NUM >= 0x080600 /* Available since 8.6.0 */
1892+
case CURLOPT_SERVER_RESPONSE_TIMEOUT_MS:
1893+
#endif
18911894
#if LIBCURL_VERSION_NUM >= 0x080900 /* Available since 8.9.0 */
18921895
case CURLOPT_TCP_KEEPCNT:
18931896
#endif
@@ -2031,6 +2034,12 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
20312034
case CURLOPT_PASSWORD:
20322035
#if LIBCURL_VERSION_NUM >= 0x080e00 /* Available since 8.14.0 */
20332036
case CURLOPT_SSL_SIGNATURE_ALGORITHMS:
2037+
#endif
2038+
#if LIBCURL_VERSION_NUM >= 0x080200 /* Available since 8.2.0 */
2039+
case CURLOPT_HAPROXY_CLIENT_IP:
2040+
#endif
2041+
#if LIBCURL_VERSION_NUM >= 0x080800 /* Available since 8.8.0 */
2042+
case CURLOPT_ECH:
20342043
#endif
20352044
{
20362045
if (Z_ISNULL_P(zvalue)) {

0 commit comments

Comments
 (0)