Skip to content

ext/curl: libcurl CURLOPT_{FTP_RESPONSE_TIMEOUT,ENCODING} replacements #15126

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
merged 2 commits into from
Aug 31, 2024
Merged

ext/curl: libcurl CURLOPT_{FTP_RESPONSE_TIMEOUT,ENCODING} replacements #15126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
700e3ad
ext/curl: Add `CURLOPT_SERVER_RESPONSE_TIMEOUT`
Ayesh Jul 27, 2024
dc4eb68
ext/curl: Update stub `CURLOPT_ENCODING` `@cvalue` to `CURLOPT_ACCEPT…
Ayesh Jul 27, 2024
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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ PHP NEWS
EAI_SYSTEM not found). (nielsdos)
. Implemented asymmetric visibility for properties. (ilutov)

- Curl:
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
CURLOPT_FTP_RESPONSE_TIMEOUT. (Ayesh Karunaratne)

- Date:
. Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end
date). (Mark Bennewitz, Derick)
Expand Down
3 changes: 3 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ PHP 8.4 UPGRADE NOTES
supported (true) or not (false).
. Added CURL_HTTP_VERSION_3 and CURL_HTTP_VERSION_3ONLY constants (available
since libcurl 7.66 and 7.88) as available options for CURLOPT_HTTP_VERSION.
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
CURLOPT_FTP_RESPONSE_TIMEOUT. Both constants hold the same value.

- Date:
. Added static methods
Expand Down Expand Up @@ -996,6 +998,7 @@ PHP 8.4 UPGRADE NOTES
. CURL_HTTP_VERSION_3.
. CURL_HTTP_VERSION_3ONLY.
. CURL_TCP_KEEPCNT
. CURLOPT_SERVER_RESPONSE_TIMEOUT.

- Intl:
. The IntlDateFormatter class exposes now the new PATTERN constant
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
const CURLOPT_EGDSOCKET = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_ENCODING
* @cvalue CURLOPT_ACCEPT_ENCODING
* @alias CURLOPT_ACCEPT_ENCODING
*/
const CURLOPT_ENCODING = UNKNOWN;
/**
Expand Down Expand Up @@ -1291,9 +1292,15 @@
const CURLINFO_PROXYAUTH_AVAIL = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_FTP_RESPONSE_TIMEOUT
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
* @alias CURLOPT_SERVER_RESPONSE_TIMEOUT
*/
const CURLOPT_FTP_RESPONSE_TIMEOUT = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
*/
const CURLOPT_SERVER_RESPONSE_TIMEOUT = UNKNOWN;
/**
* @var int
* @cvalue CURLOPT_IPRESOLVE
Expand Down
7 changes: 4 additions & 3 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.

2 changes: 1 addition & 1 deletion ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
case CURLOPT_HTTPAUTH:
case CURLOPT_FTP_CREATE_MISSING_DIRS:
case CURLOPT_PROXYAUTH:
case CURLOPT_FTP_RESPONSE_TIMEOUT:
case CURLOPT_SERVER_RESPONSE_TIMEOUT:
case CURLOPT_IPRESOLVE:
case CURLOPT_MAXFILESIZE:
case CURLOPT_TCP_NODELAY:
Expand Down
Loading