8 commits

Author	SHA1	Message	Date
Nikita Popov	250393f925	Revert JSON changes to PHP 5.3 ... This reverts the following commits: 974324676b 4662151ea7 84fe2cc890 This does not revert the JSON changes released in PHP 5.3.14.	2012-07-01 16:28:57 +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
Scott MacVicar	87dbefa03b	MFH: Add error constant when json_encode detects an invalid UTF-8 sequence.	2009-07-27 03:43:38 +00:00
Scott MacVicar	d2a7785878	MFH Allow a custom recursion depth to be specified for json_decode()	2009-05-14 22:02:08 +00:00
Scott MacVicar	fdf2d1e46f	MFH Add json_last_error() for getting a bit of information about what failed during a decode, also fixes a segfault when we have [1} ... [DOC]	2008-12-19 02:00:57 +00:00
Scott MacVicar	8ef7fe1d99	Update the JSON parser with that on json.org, biggest change here is code readability. Less magic numbers in the state table. ... Add missing reflection information to json_encode() Fixes bug #45791 with 0e0 not being supported as a value Error values are stored when encountered during parsing	2008-12-17 14:40:06 +00:00
Ilia Alshanetsky	cdfe00b801	Fixed compiler warnings and enable Json by default.	2006-07-19 16:17:15 +00:00
SVN Migration	608baa409a	This commit was manufactured by cvs2svn to create branch 'PHP_5_2'.	2006-05-05 15:49:42 +00:00