summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-07-05 15:04:10 +0200
committerAnatol Belski <ab@php.net>2016-07-05 15:04:10 +0200
commit5920445a5f524d503a96d60c00ebcb3c049efbb4 (patch)
treef597125a02495e2fadcb75514ad0ec21190b04a5 /ext/standard/basic_functions.c
parent041476f4ae1eecce97acd7b02c871b373d4cc0e5 (diff)
parent4576c41291a80de572ac21d829c226022fab47d3 (diff)
downloadphp-git-5920445a5f524d503a96d60c00ebcb3c049efbb4.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: fix possible optimization bug
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 47dbc3d9ac..20f03bb67f 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5545,7 +5545,7 @@ PHP_FUNCTION(ignore_user_abort)
return;
}
- old_setting = PG(ignore_user_abort);
+ old_setting = (unsigned short)PG(ignore_user_abort);
if (ZEND_NUM_ARGS()) {
zend_string *key = zend_string_init("ignore_user_abort", sizeof("ignore_user_abort") - 1, 0);