#
3159d518 |
| 25-Jan-2015 |
Jakub Zelenka |
Merge branch 'master' into jsond Conflicts: ext/json/JSON_parser.c ext/json/json.c
|
Revision tags: php-5.5.21, php-5.6.5, php-5.4.37 |
|
#
1fdd558e |
| 19-Jan-2015 |
Stanislav Malyshev |
Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug #50224 where float without decimals were converted to integer Updated NEWS for #68371
|
Revision tags: php-5.5.21RC1, php-5.6.5RC1, POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4, php-5.6.4RC1, php-5.5.20RC1, php-5.6.3, php-5.5.19, php-5.4.35, php-5.6.3RC1, php-5.5.19RC1, php-5.5.18, php-5.4.34, php-5.5.18RC1, php-5.6.1, php-5.6.2, php-5.4.33, php-5.5.17, php-5.6.1RC1, php-5.5.17RC1, php-5.4.33RC1, php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE, POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32, POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29, php-5.5.16RC1, php-5.4.32RC1, php-5.3.29RC1, php-5.6.0RC3, php-5.5.15, php-5.4.31, php-5.4.31RC1, php-5.5.15RC1, php-5.6.0RC2, php-5.4.30, php-5.5.14, php-5.6.0RC1, php-5.5.14RC1, php-5.4.30RC1, php-5.6.0beta4, php-5.4.29, php-5.5.13, php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1, php-5.6.0beta2, php-5.5.12, php-5.4.28, php-5.4.28RC1, php-5.5.12RC1, php-5.6.0beta1, php-5.4.27, php-5.5.11 |
|
#
ac7cfad3 |
| 29-Mar-2014 |
Juan Basso |
Fixed bug #50224 where float without decimals were converted to integer |
#
fc33f52d |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
#
0579e827 |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
#
73c1be26 |
| 15-Jan-2015 |
Xinchen Hui |
Bump year |
#
95cef47a |
| 13-Jan-2015 |
Juan Basso |
Porting implementation of RFC json_preserve_fractional_part |
#
b7a7b1a6 |
| 03-Jan-2015 |
Stanislav Malyshev |
trailing whitespace removal |
#
b68da91d |
| 27-Dec-2014 |
Jakub Zelenka |
Merge branch 'master' into jsond Conflicts: ext/json/JSON_parser.c ext/json/JSON_parser.h ext/json/config.m4 ext/json/config.w32 e
Merge branch 'master' into jsond Conflicts: ext/json/JSON_parser.c ext/json/JSON_parser.h ext/json/config.m4 ext/json/config.w32 ext/json/json.c ext/json/php_json.h
show more ...
|
#
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
#
f18aae60 |
| 30-Nov-2014 |
Jakub Zelenka |
Fix compilation for json_encoder |
#
a4e59c39 |
| 25-Nov-2014 |
Jakub Zelenka |
Add missing bits to php_json.h |
#
e18dd679 |
| 24-Nov-2014 |
Jakub Zelenka |
Move json encoding stuff |
#
fea10f6a |
| 17-Oct-2014 |
Anatol Belski |
ext/iconv, ext/json and ext/session use static tsrmls pointer |
#
016a96c7 |
| 12-Oct-2014 |
Nikita Popov |
Fix ::jsonSerialize() failure message |
#
e33f3d3b |
| 20-Sep-2014 |
Nikita Popov |
Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just m
Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
show more ...
|
#
37aaccad |
| 19-Sep-2014 |
Nikita Popov |
Use inline functions for most of smart_str smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope
Use inline functions for most of smart_str smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope, instead it returns the new length.
show more ...
|
#
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
#
3bc8a958 |
| 19-Sep-2014 |
Dmitry Stogov |
Fixed useless or duplicated IS_INTERNED() checks |
#
232459ef |
| 27-Aug-2014 |
Anatol Belski |
fix signature |
#
6db8d4f8 |
| 27-Aug-2014 |
Anatol Belski |
's' works with size_t round 3 |
#
32344808 |
| 27-Aug-2014 |
Anatol Belski |
first show to make 's' work with size_t |
#
37f9f10f |
| 27-Aug-2014 |
Dmitry Stogov |
Improved performance of json_encode() |
#
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
#
19588572 |
| 19-Aug-2014 |
Anatol Belski |
ported ext/json |