| #
ed35de78 |
| 01-Jan-2016 |
Lior Kaplan |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
| #
49493a2d |
| 01-Jan-2016 |
Lior Kaplan |
Happy new year (Update copyright to 2016) |
|
Revision tags: php-7.0.2RC1, php-5.6.17RC1, php-7.0.1RC1, php-7.0.0, php-5.6.16, php-7.0.0RC8, php-7.0.0RC7, php-5.6.16RC1, php-5.6.15, php-7.0.0RC6, php-7.0.1, php-5.6.15RC1, php-7.0.0RC5, php-5.5.30, php-5.6.14, php-7.0.0RC4, php-5.6.14RC1, php-7.0.0RC3 |
|
| #
7fe2646b |
| 04-Sep-2015 |
Jakub Zelenka |
Move json_decode options macros bellow encode options |
| #
45fdff1c |
| 04-Sep-2015 |
Ryan McCullagh |
json: fix formating of PHP_JSON* option bitshifts |
| #
26e619b1 |
| 03-Sep-2015 |
Joe Watkins |
these need to be exported for extensions that use json |
|
Revision tags: php-5.6.13, php-7.0.0RC2, php-5.5.29, php-5.4.45, php-5.6.13RC1, php-7.0.0RC1, php-5.6.12, php-5.5.28, php-7.0.0beta3, php-5.4.44 |
|
| #
4e66cce8 |
| 29-Jul-2015 |
Anatol Belski |
switch to the unified globals accessor where appropriate |
|
Revision tags: php-5.6.12RC1, php-7.0.0beta2, php-7.0.0beta1, php-5.6.11, php-5.5.27, php-5.4.43, php-5.6.11RC1, php-5.5.27RC1, php-7.0.0alpha2 |
|
| #
f3df3df8 |
| 21-Jun-2015 |
Jakub Zelenka |
Fix bug #68546 (json_decode cannot access property started with \0) |
|
Revision tags: php-5.5.26, php-7.0.0alpha1, php-5.6.10, php-5.4.42, POST_PHP7_NSAPI_REMOVAL, PRE_PHP7_NSAPI_REMOVAL, php-5.6.10RC1, php-5.5.26RC1, php-5.5.25, php-5.6.9, php-5.4.41, php-5.6.9RC1, php-5.5.25RC1, php-5.6.8, php-5.5.24, php-5.4.40, php-5.6.8RC1, php-5.5.24RC1, php-5.6.7, php-5.5.23, php-5.4.39, php-5.6.7RC1, php-5.5.23RC1, POST_PHP7_EREG_MYSQL_REMOVALS, PRE_PHP7_EREG_MYSQL_REMOVALS, php-5.6.6, php-5.5.22 |
|
| #
3ddc246b |
| 17-Feb-2015 |
Jakub Zelenka |
Set PHP_JSON_VERSION to 1.4.0 |
|
Revision tags: php-5.4.38, POST_PHP7_REMOVALS, PRE_PHP7_REMOVALS |
|
| #
09a3e737 |
| 09-Feb-2015 |
Michael Wallner |
fix json globals |
|
Revision tags: php-5.6.6RC1, php-5.5.22RC1 |
|
| #
20bae2a5 |
| 02-Feb-2015 |
Jakub Zelenka |
Give me credit |
| #
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 |
| #
95cef47a |
| 13-Jan-2015 |
Juan Basso |
Porting implementation of RFC json_preserve_fractional_part |
| #
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 |
| #
a4e59c39 |
| 25-Nov-2014 |
Jakub Zelenka |
Add missing bits to php_json.h |
| #
432b73fd |
| 16-Nov-2014 |
Jakub Zelenka |
Add error codes to php_json.h |
| #
fea10f6a |
| 17-Oct-2014 |
Anatol Belski |
ext/iconv, ext/json and ext/session use static tsrmls pointer |
| #
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 ...
|
| #
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
| #
232459ef |
| 27-Aug-2014 |
Anatol Belski |
fix signature |
| #
074c68e9 |
| 27-Aug-2014 |
Anatol Belski |
fix signature |
