diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:39:32 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-11-20 20:39:32 +0000 |
| commit | 563a341df7c7a74de706d62ab5e4a8a0c2e9152f (patch) | |
| tree | 3c6838650f9e6af340f809124c2b48e9498849b5 /ext/json | |
| parent | 42449d431f835d13bad4eb5b245c9d0dc577b279 (diff) | |
| parent | f284479734f1612c06a9d8987453a533ddea4a6e (diff) | |
| download | php-git-563a341df7c7a74de706d62ab5e4a8a0c2e9152f.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext/json')
| -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; } /* }}} */ |