Skip to content

ext/curl: add more options to curl #22840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kocsismate merged 1 commit into from
Nov 12, 2026
Merged

ext/curl: add more options to curl #22840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ PHP 8.7 UPGRADE NOTES
- Curl:
. Multiple files can now be uploaded with the same field name by passing an
array of CURLFile or CURLStringFile objects to CURLOPT_POSTFIELDS.
. Support for upstream options CURLOPT_ECH, CURLOPT_HAPROXY_CLIENT_IP, and
CURLOPT_SERVER_RESPONSE_TIMEOUT_MS.

- Intl:
. Added IntlRelativeDateTimeFormatter to format relative date and time offsets
Expand Down Expand Up @@ -165,6 +167,12 @@ PHP 8.7 UPGRADE NOTES
10. New Global Constants
========================================

- Curl:
. New options: CURLOPT_ECH, CURLOPT_HAPROXY_CLIENT_IP,
CURLOPT_SERVER_RESPONSE_TIMEOUT_MS.
. CURLOPT_MAIL_RCPT_ALLOWFAILS is the correctly spelled alternative to
CURLOPT_MAIL_RCPT_ALLLOWFAILS.

========================================
11. Changes to INI File Handling
========================================
Expand Down
28 changes: 27 additions & 1 deletion ext/curl/curl.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
kocsismate marked this conversation as resolved.
Resolved
*/
const CURLOPT_ECH = UNKNOWN;
#endif
/**
* @var int
* @cvalue CURLOPT_EGDSOCKET
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3279,7 +3300,12 @@
#if LIBCURL_VERSION_NUM >= 0x074500 /* Available since 7.69.0 */
/**
* @var int
* @cvalue CURLOPT_MAIL_RCPT_ALLLOWFAILS
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
*/
const CURLOPT_MAIL_RCPT_ALLOWFAILS = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_MAIL_RCPT_ALLOWFAILS
*/
const CURLOPT_MAIL_RCPT_ALLLOWFAILS = UNKNOWN;
#endif
Expand Down
14 changes: 12 additions & 2 deletions ext/curl/curl_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ext/curl/curl_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#include <curl/curl.h>
#include <curl/multi.h>

#if LIBCURL_VERSION_NUM < 0x080200 /* Available since 8.2.0 */
# define CURLOPT_MAIL_RCPT_ALLOWFAILS CURLOPT_MAIL_RCPT_ALLLOWFAILS
#endif

#define CURLOPT_RETURNTRANSFER 19913
#define CURLOPT_BINARYTRANSFER 19914 /* For Backward compatibility */
#define PHP_CURL_STDOUT 0
Expand Down
11 changes: 10 additions & 1 deletion ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,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:
Comment thread
kocsismate marked this conversation as resolved.
Resolved
#endif
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
case CURLOPT_HSTS_CTRL:
Expand All @@ -1888,6 +1888,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
Expand Down Expand Up @@ -2031,6 +2034,12 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
case CURLOPT_PASSWORD:
#if LIBCURL_VERSION_NUM >= 0x080e00 /* Available since 8.14.0 */
case CURLOPT_SSL_SIGNATURE_ALGORITHMS:
#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
{
if (Z_ISNULL_P(zvalue)) {
Expand Down
Loading