diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2015-06-25 10:30:41 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2015-06-25 10:31:37 -0700 |
| commit | 7ceb47477dbaac39d4ee42c3070463e229d2f090 (patch) | |
| tree | cb36c50cdd7471dcf27fa3b9b999d869b9a317a0 /ext/standard/basic_functions.c | |
| parent | 20585beb76f54c2991c0d71b08afd9fffb3788b3 (diff) | |
| download | php-git-7ceb47477dbaac39d4ee42c3070463e229d2f090.tar.gz | |
3rd arg to stream_set_timeout is optional
ignore_user_abort() should take a bool not a string
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index c96996e091..81f54a5e99 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2089,7 +2089,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_set_blocking, 0) ZEND_END_ARG_INFO() #if HAVE_SYS_TIME_H || defined(PHP_WIN32) -ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_set_timeout, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, seconds) ZEND_ARG_INFO(0, microseconds) @@ -5509,14 +5509,14 @@ PHP_FUNCTION(connection_status) } /* }}} */ -/* {{{ proto int ignore_user_abort([string value]) +/* {{{ proto int ignore_user_abort([bool value]) Set whether we want to ignore a user abort event or not */ PHP_FUNCTION(ignore_user_abort) { - zend_string *arg = NULL; + zend_bool arg = 0; int old_setting; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S", &arg) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &arg) == FAILURE) { return; } @@ -5524,7 +5524,7 @@ PHP_FUNCTION(ignore_user_abort) if (arg) { zend_string *key = zend_string_init("ignore_user_abort", sizeof("ignore_user_abort"), 0); - zend_alter_ini_entry_ex(key, arg, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0); + zend_alter_ini_entry_chars(key, arg ? "1" : "0", 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); zend_string_release(key); } |