summaryrefslogtreecommitdiff
path: root/src/sp_disabled_functions.c
diff options
context:
space:
mode:
authorjvoisin2019-02-23 00:03:14 +0000
committerGitHub2019-02-23 00:03:14 +0000
commita48297dfc1144931e18073a87ed83ea337e3d37a (patch)
treedbd421aeed4541b8392bb9cf9b5ea575244e1b83 /src/sp_disabled_functions.c
parent01dbd02341d4afa753830a1e642a59c8f7a0bbee (diff)
Add php8 to travis and fix php7.4
- Use clang-format on the code - Improve portability wrt. php8 - Fix php7.4 compatibility. See https://dustri.org/b/fixing-snuffleupagus-sloppy-comparison-on-array_keys-for-php74.html for a detailed writeup
Diffstat (limited to 'src/sp_disabled_functions.c')
-rw-r--r--src/sp_disabled_functions.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index bb22f71..0f42f8f 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -371,11 +371,8 @@ static void should_disable(zend_execute_data* execute_data,
371 } 371 }
372 372
373 if (config_node->r_value || config_node->value) { 373 if (config_node->r_value || config_node->value) {
374 if (check_is_builtin_name(config_node) && 374 if (check_is_builtin_name(config_node) && !config_node->var &&
375 !config_node->var && 375 !config_node->key && !config_node->r_key && !config_node->param &&
376 !config_node->key &&
377 !config_node->r_key &&
378 !config_node->param &&
379 !config_node->r_param) { 376 !config_node->r_param) {
380 if (false == is_param_matching(execute_data, config_node, builtin_param, 377 if (false == is_param_matching(execute_data, config_node, builtin_param,
381 &arg_name, builtin_param_name, 378 &arg_name, builtin_param_name,