archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  Fixed bug #50224 where float without decimals were converted to integer
  Updated NEWS for #68371
This commit is contained in:
Stanislav Malyshev 2015-01-19 10:05:57 -08:00
commit 1fdd558e39
3 changed files with 90 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/json/php_json.h
View file

@ -68,6 +68,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