diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:38:34 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:38:34 +0000 |
| commit | f284479734f1612c06a9d8987453a533ddea4a6e (patch) | |
| tree | f679995cff742dc653ccd6cb9525cde8052b4cba /ext/json/json.c | |
| parent | 47252a1e7489718c8c9db3b92b78df2e2e116936 (diff) | |
| parent | 60574ea1ac4790abe818c2c7510d0e391c12c06a (diff) | |
| download | php-git-f284479734f1612c06a9d8987453a533ddea4a6e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 202296c65c..6081519736 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -141,7 +141,7 @@ static PHP_GINIT_FUNCTION(json) #endif json_globals->encoder_depth = 0; json_globals->error_code = 0; - json_globals->encode_max_depth = 0; + json_globals->encode_max_depth = PHP_JSON_PARSER_DEFAULT_DEPTH; } /* }}} */ |