8 Commits

Author	SHA1	Message	Date
Nikita Popov	b7903f9778	Revert JSON merges to 5.4 ... This reverts the following merge commits (-m 1): 405ebfcd18 d372b33c9b 36fa17a5fa	2012-07-01 16:38:26 +02:00
Nikita Popov	974324676b	Add json_last_error_msg() function ... This replaces json_last_error(true) and is consistent with other custom error handling functions.	2012-06-28 20:11:27 +02:00
Nikita Popov	4662151ea7	Improve JSON error handling ... json_encode() no longer throws warnings. Instead only the error code for json_last_error() is set. As it is hard to debug the error from just an error code an optional $as_string parameter was added to json_last_error(), which returns an error message instead of an error code.	2012-06-27 12:21:48 +02:00
Nikita Popov	84fe2cc890	Improve json_encode error handling ... json_encode() now returns bool(false) for all possible errors, throws the respective warning and also sets the respective json_last_error() error code. Three new error codes have been added: * JSON_ERROR_RECURSION * JSON_ERROR_INF_OR_NAN * JSON_ERROR_UNSUPPORTED_TYPE To get a partial JSON output instead of bool(false) the option JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid segments will be replaced either by null (for recursion, unsupported type and invalid JSON) or 0 (for Inf and NaN). The warning for invalid UTF-8 stays intact and is thrown also with display_errors = On. If this behavior is undesired this can be remedied later.	2012-06-23 20:51:52 +02:00
Felipe Pena	4d571dee74	- Fixed tests	2010-04-03 15:42:42 +00:00
Dmitry Stogov	3b2fa0ce82	Fix memory leaks	2006-09-13 13:25:50 +00:00
Antony Dovgal	3003cd2473	MFH: use E_WARNING on recursion and add null to the result to keep it valid	2006-07-20 09:33:28 +00:00
Antony Dovgal	3e308d3a6b	MFH: add recursion protection to json_encode() and new tests	2006-07-20 08:56:57 +00:00