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/php_json.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/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index ef3e4b5a79..afeff3f6cc 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -63,6 +63,7 @@ extern zend_class_entry *php_json_serializable_ce; #define PHP_JSON_UNESCAPED_SLASHES (1<<6) #define PHP_JSON_PRETTY_PRINT (1<<7) #define PHP_JSON_UNESCAPED_UNICODE (1<<8) +#define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 |