Jakub Zelenka
3ddc246b5a
Set PHP_JSON_VERSION to 1.4.0
2015-02-17 20:52:06 +00:00
Michael Wallner
09a3e7377a
fix json globals
2015-02-09 17:57:18 +01:00
Jakub Zelenka
20bae2a503
Give me credit
2015-02-02 19:33:48 +00:00
Jakub Zelenka
3159d518d0
Merge branch 'master' into jsond
...
Conflicts:
ext/json/JSON_parser.c
ext/json/json.c
2015-01-25 18:43:15 +00:00
Stanislav Malyshev
1fdd558e39
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #50224 where float without decimals were converted to integer
Updated NEWS for #68371
2015-01-19 10:05:57 -08:00
Juan Basso
ac7cfad3b5
Fixed bug #50224 where float without decimals were converted to integer
2015-01-19 00:46:02 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Juan Basso
95cef47afb
Porting implementation of RFC json_preserve_fractional_part
2015-01-12 21:29:52 -05:00
Jakub Zelenka
b68da91d52
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
2014-12-27 19:42:04 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Jakub Zelenka
a4e59c39a7
Add missing bits to php_json.h
2014-11-25 20:36:41 +00:00
Jakub Zelenka
432b73fdee
Add error codes to php_json.h
2014-11-16 15:13:15 +00:00
Anatol Belski
fea10f6a5e
ext/iconv, ext/json and ext/session use static tsrmls pointer
2014-10-17 14:16:40 +02:00
Nikita Popov
e33f3d3b7c
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.
2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
232459efd0
fix signature
2014-08-27 22:13:01 +02:00
Anatol Belski
074c68e9ce
fix signature
2014-08-27 22:05:26 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
1958857225
ported ext/json
2014-08-19 20:15:59 +02:00
Julien Pauli
1ba76df8d0
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:39:39 +01:00
Julien Pauli
8a1d248d4e
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:38:51 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Florian Anderiasch
45d596ea1e
Add optional depth parameter to json_encode #62369
2012-07-24 13:15:16 +02:00
Nikita Popov
36fa17a5fa
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
2012-06-23 21:14:45 +02:00
Stanislav Malyshev
7bbd5521d2
Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
...
This reverts commit cb2a1c71c9
.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
2012-05-01 23:54:10 -07:00
Adam Harvey
cb2a1c71c9
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
...
remove a test case that's now mooted by this fix.
2012-04-11 08:29:39 +08:00
Adam Harvey
3f3ad30c50
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
...
remove a test case that's now mooted by this fix.
2012-04-11 08:24:38 +08:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Gwynne Raskind
06292974b1
Add unescaped Unicode encoding to json_encode(). Closes bug #53946 . Patch by Irker and Gwynne.
2011-08-29 14:56:19 +00:00
Felipe Pena
927bf09c29
- Year++
2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Adam Harvey
cb9c8233fc
Implement FR #44331 (Formatting option for json_encode). Bikeshedding about the
...
exact form of the JSON pretty printing and brace handling will only be accepted
in the form of patches. ;)
2010-09-16 16:21:15 +00:00
Adam Harvey
726fe638bb
Implemented FR #49366 (Make slash escaping optional in json_encode()).
2010-09-16 13:53:27 +00:00
Sara Golemon
a0269a6a72
Ooops, return values...
2010-05-21 23:29:34 +00:00
Sara Golemon
6eb4218433
Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbers
...
as strings rather than casting to double and loosing precision.
2010-05-21 22:59:58 +00:00
Ilia Alshanetsky
ea3a6539dc
Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
...
numeric strings to integers.
2010-05-20 19:37:52 +00:00
Ilia Alshanetsky
cf174c1366
Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
...
numeric strings to integers.
2010-05-20 19:37:52 +00:00
Sara Golemon
1381b14eaa
Add JSON_Serializable interface
...
Objects implementing JSON_Serializable will have
their ->jsonSerialize() method called
Similar to serialize() and __sleep()
2010-05-05 22:48:14 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Stanislav Malyshev
2361b4ea2a
fix json shared build on Windows
2009-06-30 17:52:21 +00:00
Andrei Zmievski
77beb62c5f
Fix the build.
2009-05-31 18:55:10 +00:00
Andrei Zmievski
efc0927f4f
Expose encode/decode API.
2009-05-31 01:44:07 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Scott MacVicar
fdf2d1e46f
MFH Add json_last_error() for getting a bit of information about what failed during a decode, also fixes a segfault when we have [1}
...
[DOC]
2008-12-19 02:00:57 +00:00
Jani Taskinen
7e67bc4e80
MFH: unused stuff
2008-07-22 14:57:46 +00:00
Nuno Lopes
61eb7ae554
remove unused PHP_EXTNAME_API macros.
...
#in preparation for the gcc 4 visibility patch
2008-01-03 16:20:33 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00