Merge branch 'PHP-7.0' into PHP-7.1

bukka · bukka · commit f284479734f1 · 2016-11-20T20:38:34.000Z
diff --git 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;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ static PHP_GINIT_FUNCTION(json)`
`141`	`141`	`#endif`
`142`	`142`	`json_globals->encoder_depth = 0;`
`143`	`143`	`json_globals->error_code = 0;`
`144`		`- json_globals->encode_max_depth = 0;`
	`144`	`+ json_globals->encode_max_depth = PHP_JSON_PARSER_DEFAULT_DEPTH;`
`145`	`145`	`}`
`146`	`146`	`/* }}} */`
`147`	`147`