From 0579e8278dad43c7ebc070468b56caddf1c660b8 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 15 Jan 2015 23:26:37 +0800 Subject: bump year --- ext/json/php_json.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/json/php_json.h') diff --git a/ext/json/php_json.h b/ext/json/php_json.h index e00de6a27b..7347ef7e06 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2014 The PHP Group | + | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From fc33f52d8c25997dd0711de3e07d0dc260a18c11 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 15 Jan 2015 23:27:30 +0800 Subject: bump year --- ext/json/php_json.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/json/php_json.h') diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 62eca734a2..b175d9a157 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2014 The PHP Group | + | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From ac7cfad3b54b04b7ff2d0e4bfd26e8b61d233613 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sat, 29 Mar 2014 19:41:48 -0400 Subject: Fixed bug #50224 where float without decimals were converted to integer --- ext/json/php_json.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/json/php_json.h') diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 7347ef7e06..efd872b5f4 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -65,6 +65,7 @@ extern PHP_JSON_API zend_class_entry *php_json_serializable_ce; #define PHP_JSON_PRETTY_PRINT (1<<7) #define PHP_JSON_UNESCAPED_UNICODE (1<<8) #define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9) +#define PHP_JSON_PRESERVE_ZERO_FRACTION (1<<10) /* Internal flags */ #define PHP_JSON_OUTPUT_ARRAY 0 -- cgit v1.2.1