summaryrefslogtreecommitdiff
path: root/ext/standard/assert.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-05-26 18:17:43 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-05-26 18:17:43 +0000
commit8267eaf1bfeeb65c3ce09190045a9c992243cfee (patch)
tree8cdfd36740a7164444c2da76095e659859221319 /ext/standard/assert.c
parent885357a711ba0313c3316b1680ba16cac12bd3ad (diff)
downloadphp-git-8267eaf1bfeeb65c3ce09190045a9c992243cfee.tar.gz
Fixed bug #54924 (assert.* is not being reset upon request shutdown).
Diffstat (limited to 'ext/standard/assert.c')
-rw-r--r--ext/standard/assert.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index a42f678ec5..9fd1104928 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -253,8 +253,8 @@ PHP_FUNCTION(assert_options)
case ASSERT_ACTIVE:
oldint = ASSERTG(active);
if (ac == 2) {
- convert_to_long_ex(value);
- ASSERTG(active) = Z_LVAL_PP(value);
+ convert_to_string_ex(value);
+ zend_alter_ini_entry_ex("assert.active", sizeof("assert.active"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -262,8 +262,8 @@ PHP_FUNCTION(assert_options)
case ASSERT_BAIL:
oldint = ASSERTG(bail);
if (ac == 2) {
- convert_to_long_ex(value);
- ASSERTG(bail) = Z_LVAL_PP(value);
+ convert_to_string_ex(value);
+ zend_alter_ini_entry_ex("assert.bail", sizeof("assert.bail"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -271,8 +271,8 @@ PHP_FUNCTION(assert_options)
case ASSERT_QUIET_EVAL:
oldint = ASSERTG(quiet_eval);
if (ac == 2) {
- convert_to_long_ex(value);
- ASSERTG(quiet_eval) = Z_LVAL_PP(value);
+ convert_to_string_ex(value);
+ zend_alter_ini_entry_ex("assert.quiet_eval", sizeof("assert.quiet_eval"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -280,8 +280,8 @@ PHP_FUNCTION(assert_options)
case ASSERT_WARNING:
oldint = ASSERTG(warning);
if (ac == 2) {
- convert_to_long_ex(value);
- ASSERTG(warning) = Z_LVAL_PP(value);
+ convert_to_string_ex(value);
+ zend_alter_ini_entry_ex("assert.warning", sizeof("assert.warning"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;