diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2012-09-04 10:29:22 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2012-09-04 10:29:22 -0400 |
| commit | 824f1f45818096eff0e022ba2a1cbc2071343c9a (patch) | |
| tree | 821b106513b7835d8e7fad8960446167142028f9 /ext/json/php_json.h | |
| parent | e05413ca594ff10fd93d40429cb598c2e109edf4 (diff) | |
| parent | 4b206126aca2ad9181abe65d70367680a4bc4c03 (diff) | |
| download | php-git-824f1f45818096eff0e022ba2a1cbc2071343c9a.tar.gz | |
Merge remote branch 'upstream/master' into hash_password
* upstream/master: (393 commits)
forked two tests for windows
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
Implemented ReflectionFunction::isGenerator()
Allow null as a default value for length in mb_substr() and mb_strcut()
Allow null as a default value for length in mb_substr() and mb_strcut()
folder
Initializing optional argument description in assert()
Initializing optional argument description in assert()
Fix test failed due to new Token T_YIELD
fix NEWS
Fix leak when yielding array as key
Drop obsolete test
Remove extra blank in notice message, should act as same as vm
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
assert() user message
...
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index afeff3f6cc..2b3cf5868a 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -40,6 +40,7 @@ extern zend_module_entry json_module_entry; ZEND_BEGIN_MODULE_GLOBALS(json) int encoder_depth; int error_code; + int encode_max_depth; ZEND_END_MODULE_GLOBALS(json) #ifdef ZTS |