Don't call php_uname function if disabled by php.ini #829
Conversation
This file contains 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
richardm-stripe
force-pushed
the
richardm-dont-call-phpuname-if-disabled
branch
from
c859e8a to
392f8af
Compare
remi-stripe
reviewed
Jan 9, 2020
| @@ -260,7 +260,8 @@ private static function _defaultHeaders($apiKey, $clientInfo = null) | |||
| $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION; | |||
|
|
|||
| $langVersion = phpversion(); | |||
| $uname = php_uname(); | |||
| $uname_disabled = in_array('php_uname', explode(',', ini_get('disable_functions'))); | |||
| $uname = $uname_disabled ? '(disabled)' : php_uname(); | |||
There was a problem hiding this comment.
Minor but have we considered making that call once when the library or client is initialized and then use a cached value instead of doing that on each request?
There was a problem hiding this comment.
I'll probably do just that if/when I ever get to rewriting the HTTP client layer.
ob-stripe
approved these changes
Jan 10, 2020
| @@ -260,7 +260,8 @@ private static function _defaultHeaders($apiKey, $clientInfo = null) | |||
| $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION; | |||
|
|
|||
| $langVersion = phpversion(); | |||
| $uname = php_uname(); | |||
| $uname_disabled = in_array('php_uname', explode(',', ini_get('disable_functions'))); | |||
| $uname = $uname_disabled ? '(disabled)' : php_uname(); | |||
There was a problem hiding this comment.
I'll probably do just that if/when I ever get to rewriting the HTTP client layer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Addresses #828. Some hosting providers disable the php_uname function, presumably by adding it to 'disable_functions' in php.ini. This PR retrieves the value of 'disable_functions', parses the comma-separated list it to see if 'php_uname' is contained. In that case, we hardcode uname to "(disabled)" to avoid calling php_uname.
r? @ob-stripe
cc @remi-stripe