-
Couldn't load subscription status.
- Fork 8k
[cURL] Add missing CURLE_* constants
#4079
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| curl_strerror test constants not defined with < 7.16.1 | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('curl')) { | ||
| exit('skip curl extension not loaded'); | ||
| } | ||
| $curl_version = curl_version(); | ||
| if ($curl_version['version_number'] >= 0x071001) { | ||
| exit('skip: test works only with curl < 7.16.1'); | ||
| } | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| var_dump(strtolower(curl_strerror(CURLE_REMOTE_FILE_NOT_FOUND))); | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Warning: Use of undefined constant CURLE_SEND_FAIL_REWIND - assumed 'CURLE_SEND_FAIL_REWIND' (this will throw an Error in a future version of PHP) in %s on line %d | ||
| Warning: curl_strerror() expects parameter 1 to be integer, string given in %s on line %d |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --TEST-- | ||
| curl_strerror test constants from >= 7.16.1 | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('curl')) { | ||
| exit('skip curl extension not loaded'); | ||
| } | ||
| $curl_version = curl_version(); | ||
| if ($curl_version['version_number'] < 0x071001) { | ||
| exit('skip: test works only with curl >= 7.16.1'); | ||
| } | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| var_dump(strtolower(curl_strerror(CURLE_REMOTE_FILE_NOT_FOUND))); | ||
| var_dump(strtolower(curl_strerror(CURLE_SSL_SHUTDOWN_FAILED))); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| string(21) "remote file not found" | ||
| string(38) "failed to shut down the ssl connection" |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, some of these constants (such as these two) are not relevant for end users, because the character conversion functionality is not exported by PHP (and won't be). I'm wondering whether or not we should still define them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know about the use case for these constants, but IMO we should blacklist them given your explanation.
If the extension isn't really capable to get this kind of errors, the only use case I can imagine is to compare error codes returned by userland code, maybe a library using the system's cURL library directly via
passthru()or similar.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the decision is to not include these constants, they must be added to
IGNORED_CONSTANTS:php-src/ext/curl/sync-constants.php
Lines 16 to 18 in 906331a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also think they shouldn't be exposed.