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:24:38 +0800
commit3f3ad30c50c32327e723046bcc6649d05dd9236a (patch)
tree83dc55736d58da4cd82c77a25baaf5fa04eb2e72 /ext/json/php_json.h
parent1c8fccdf6d6d04d8e6a5dedd7c9d6b1afda8839f (diff)
downloadphp-git-3f3ad30c50c32327e723046bcc6649d05dd9236a.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 b104d4ca6a..3cb4902e27 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -56,6 +56,7 @@ PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len, ze
#define PHP_JSON_HEX_QUOT (1<<3)
#define PHP_JSON_FORCE_OBJECT (1<<4)
#define PHP_JSON_NUMERIC_CHECK (1<<5)
+#define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9)
#define PHP_JSON_OUTPUT_ARRAY 0
#define PHP_JSON_OUTPUT_OBJECT 1