summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAdam Harvey <adam@pwd.net.au>2012-04-02 09:46:18 +0800
committerAdam Harvey <adam@pwd.net.au>2012-04-11 08:29:39 +0800
commitcb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b (patch)
tree71f9efc6d0496d756594025851ffe09966682268 /ext/json/php_json.h
parent112a476b683a634390b23fe7509d5b73632d0829 (diff)
downloadphp-git-cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b.tar.gz
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
remove a test case that's now mooted by this fix.
Diffstat (limited to 'ext/json/php_json.h')
-rw-r--r--ext/json/php_json.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index ef3e4b5a79..20426c0153 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