diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-10-26 16:58:45 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-10-26 16:58:45 -0700 |
| commit | 8d84b1f67adb71bdb2394b62faad04b22f6226f3 (patch) | |
| tree | 0c1c1ed2aaef8eee971575eb5e336631295f4951 /ext/standard/assert.c | |
| parent | fb85d0322d39d49f37e32df6f68c9769f2cce0e4 (diff) | |
| parent | 09da8952d0434b53e740ffaca66a8051cd39cf93 (diff) | |
| download | php-git-8d84b1f67adb71bdb2394b62faad04b22f6226f3.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (240 commits)
Do not execute anything after quit or clean command
Fix last commit, and do not output unnecessary information
Stabilize execution, always run destructors and extended file breakpoints
Fix nullptr dereference in clean without exec context
remove dodgy param parser, bring userland breakpoint api inline with PHP7
disable output buffering by default
Add question to reset execution in run/exec/clean
- Updated to version 2014.9 (2014i)
actually remove this
disable output buffering, better breakpoint api for userland, remove hand parsing of params
Fix phpdbg output when outputting via php with active output handlers
Fixed Closure::call() NEWS/UPGRADING
Set engine back to initial state after fatal-ed ev command
Fix eventual stack overflow after clean cmd
Fix listing of files with no absolute path
updated libmagic.patch in master
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
NEWS
NEWS
...
Diffstat (limited to 'ext/standard/assert.c')
| -rw-r--r-- | ext/standard/assert.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 65472170e2..fa5ccfc12f 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -25,12 +25,12 @@ /* }}} */ ZEND_BEGIN_MODULE_GLOBALS(assert) - zend_long active; - zend_long bail; - zend_long warning; - zend_long quiet_eval; zval callback; char *cb; + zend_bool active; + zend_bool bail; + zend_bool warning; + zend_bool quiet_eval; ZEND_END_MODULE_GLOBALS(assert) ZEND_DECLARE_MODULE_GLOBALS(assert) @@ -78,11 +78,11 @@ static PHP_INI_MH(OnChangeCallback) /* {{{ */ /* }}} */ PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("assert.active", "1", PHP_INI_ALL, OnUpdateLong, active, zend_assert_globals, assert_globals) - STD_PHP_INI_ENTRY("assert.bail", "0", PHP_INI_ALL, OnUpdateLong, bail, zend_assert_globals, assert_globals) - STD_PHP_INI_ENTRY("assert.warning", "1", PHP_INI_ALL, OnUpdateLong, warning, zend_assert_globals, assert_globals) + STD_PHP_INI_ENTRY("assert.active", "1", PHP_INI_ALL, OnUpdateBool, active, zend_assert_globals, assert_globals) + STD_PHP_INI_ENTRY("assert.bail", "0", PHP_INI_ALL, OnUpdateBool, bail, zend_assert_globals, assert_globals) + STD_PHP_INI_ENTRY("assert.warning", "1", PHP_INI_ALL, OnUpdateBool, warning, zend_assert_globals, assert_globals) PHP_INI_ENTRY("assert.callback", NULL, PHP_INI_ALL, OnChangeCallback) - STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateLong, quiet_eval, zend_assert_globals, assert_globals) + STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateBool, quiet_eval, zend_assert_globals, assert_globals) PHP_INI_END() static void php_assert_init_globals(zend_assert_globals *assert_globals_p TSRMLS_DC) /* {{{ */ @@ -258,7 +258,7 @@ PHP_FUNCTION(assert_options) { zval *value = NULL; zend_long what; - int oldint; + zend_bool oldint; int ac = ZEND_NUM_ARGS(); zend_string *key; |