ext/curl: libcurl CURLOPT_{FTP_RESPONSE_TIMEOUT,ENCODING} replacements
#15126
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Related: #5094. It proposed to deprecate some of the even older constants, but was unfortunately closed to time constraints. It proposed to deprecate |
devnexen
reviewed
Jul 27, 2024
Ayesh
force-pushed
the
curlopt-libcurl-v890
branch
from
feaca43 to
cd42461
Compare
devnexen
approved these changes
Jul 28, 2024
Ayesh
force-pushed
the
curlopt-libcurl-v890
branch
from
cd42461 to
ec4e3ec
Compare
Adds `CURLOPT_SERVER_RESPONSE_TIMEOUT`, available since Curl 7.20.0. `CURLOPT_SERVER_RESPONSE_TIMEOUT` holds the same value as and it meant to replace `CURLOPT_FTP_RESPONSE_TIMEOUT`. See: - https://curl.se/libcurl/c/CURLOPT_SERVER_RESPONSE_TIMEOUT.html - https://curl.se/libcurl/c/CURLOPT_FTP_RESPONSE_TIMEOUT.html
Ayesh
force-pushed
the
curlopt-libcurl-v890
branch
from
ec4e3ec to
cc3b902
Compare
…_ENCODING` In Curl 7.21.6, the `CURLOPT_ENCODING` constant was renamed to `CURLOPT_ACCEPT_ENCODING`. `CURLOPT_ENCODING` is deprecated from Curl 7.21.6. It still provides `CURLOPT_ENCODING` from `CURLOPT_ACCEPT_ENCODING` for backward compatibility. However, now that PHP requires Curl 7.61, we can safely use the new `CURLOPT_ACCEPT_ENCODING` constant.
Ayesh
force-pushed
the
curlopt-libcurl-v890
branch
from
cc3b902 to
dc4eb68
Compare
|
Rebased. Hopefully we can have this for PHP 8.4 🤓 |
Looking at it, I think it should be fine. |
|
cc @NattyNarwhal, @SakiTakamachi is it ok to add to 8.4 ? these are just constants. |
|
The PR itself was opened before the feature freeze, so I have no objection. |
|
Thanks ! |
|
Yay, thank you so much for the reviewing and merging this. |
Girgias
pushed a commit
to php/doc-en
that referenced
this pull request
Nov 16, 2024
Commit: php/php-src#15126 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_SERVER_RESPONSE_TIMEOUT` option to replace `CURLOPT_FTP_RESPONSE_TIMEOUT`](https://php.watch/versions/8.4/CURLOPT_SERVER_RESPONSE_TIMEOUT)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In ext/curl, it declares
CURLOPT_FTP_RESPONSE_TIMEOUTandCURLOPT_ENCODINGconstants although the corresponding libcurl constants are renamed.CURLOPT_FTP_RESPONSE_TIMEOUT: Renamed toCURLOPT_SERVER_RESPONSE_TIMEOUT. We do not declare the replacementCURLOPT_SERVER_RESPONSE_TIMEOUTconstant in ext/curl.CURLOPT_ENCODING: Renamed toCURLOPT_ACCEPT_ENCODING, and we do declareCURLOPT_ACCEPT_ENCODINGin ext/curl.This replaces the uses of
CURLOPT_ENCODINGandCURLOPT_FTP_RESPONSE_TIMEOUTconstants in stub@cvaluedeclarations, and uses the replacement. Libcurl declares the old constants for backward compatibility, but now that we require libcurl 7.61 or later, we can safely use the new constants.The
CURLOPT_FTP_RESPONSE_TIMEOUTconstant seems to be never used in any applications, butCURLOPT_ENCODINGis used fairly often. We could deprecate it to discourage the use of it, but I'd like to leave it for the future because there are more constants (such asCURLOPT_DNS_USE_GLOBAL_CACHE) that we can deprecate.