diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
| commit | d68b614b09b984e915db50b72430db4e4731480c (patch) | |
| tree | 2826c121a85bb3556dffdf971709574efd80d3a2 /ext/json/JSON_parser.h | |
| parent | 1fc5659ebd6f2898ab474087f7877bcc4e774403 (diff) | |
| parent | 36fa17a5fae84ab332366a202f0a709279a2466a (diff) | |
| download | php-git-d68b614b09b984e915db50b72430db4e4731480c.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Improve json_encode error handling
- BFN
- BFN
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); |