diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-23 21:14:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-23 21:14:45 +0200 |
| commit | 36fa17a5fae84ab332366a202f0a709279a2466a (patch) | |
| tree | 409c529b90ee598cfcc04357b9d4904735c89edd /ext/json/JSON_parser.h | |
| parent | e8862725770c3d5ee27c6c8c8a01b226b610fa08 (diff) | |
| parent | 84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f (diff) | |
| download | php-git-36fa17a5fae84ab332366a202f0a709279a2466a.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
Diffstat (limited to 'ext/json/JSON_parser.h')
| -rw-r--r-- | ext/json/JSON_parser.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h index 541664b8c6..8671765b4d 100644 --- a/ext/json/JSON_parser.h +++ b/ext/json/JSON_parser.h @@ -25,7 +25,10 @@ enum error_codes { PHP_JSON_ERROR_STATE_MISMATCH, PHP_JSON_ERROR_CTRL_CHAR, PHP_JSON_ERROR_SYNTAX, - PHP_JSON_ERROR_UTF8 + PHP_JSON_ERROR_UTF8, + PHP_JSON_ERROR_RECURSION, + PHP_JSON_ERROR_INF_OR_NAN, + PHP_JSON_ERROR_UNSUPPORTED_TYPE }; extern JSON_parser new_JSON_parser(int depth); |