Peter Cowburn
e77bd31f3f
fix method name in JsonSerializable exception message
2011-04-30 12:57:23 +00:00
Scott MacVicar
ecb9d8019c
Fix Bug #54058 , invalid utf-8 doesn't set json_encode() in all cases
2011-02-21 08:09:02 +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
d8b8d22a0d
Rebalance the folds in json.c.
2010-09-16 14:15:19 +00:00
Adam Harvey
726fe638bb
Implemented FR #49366 (Make slash escaping optional in json_encode()).
2010-09-16 13:53:27 +00:00
Adam Harvey
3c93eab5a3
Fix English in the error message emitted when json_decode() is called with
...
depth <= 0.
2010-09-14 03:46:28 +00:00
Scott MacVicar
bc74861cf8
Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they fail to decode.
2010-07-06 17:01:30 +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
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
1fd85e29de
Rename JSON_Serializable to JsonSerializable per ML discussion
2010-05-12 16:42:48 +00:00
Kalle Sommer Nielsen
a31a2083af
Well we do need zend_throw_exception_ex ;-)
2010-05-06 13:44:35 +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
Felipe Pena
6f03cbf664
- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)
2010-04-18 18:07:27 +00:00
Johannes Schlüter
26b08f9857
Remove main/php3_compat.h, for that a few references to function_entry
have
...
to be replaced by `zend_function_entry`.
2010-03-30 23:03:02 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Scott MacVicar
87dbefa03b
MFH: Add error constant when json_encode detects an invalid UTF-8 sequence.
2009-07-27 03:43:38 +00:00
Stanislav Malyshev
2361b4ea2a
fix json shared build on Windows
2009-06-30 17:52:21 +00:00
Felipe Pena
caf8d811ef
- MFH: Fixed memleak when depth arg is less than zero
2009-06-24 17:39:52 +00:00
Jani Taskinen
7012d0967c
MFH: no dots in errors
2009-05-31 13:51:08 +00:00
Andrei Zmievski
efc0927f4f
Expose encode/decode API.
2009-05-31 01:44:07 +00:00
Kalle Sommer Nielsen
105272bdec
MFH: Fix arginfo
2009-05-15 09:10:55 +00:00
Scott MacVicar
d2a7785878
MFH Allow a custom recursion depth to be specified for json_decode()
2009-05-14 22:02:08 +00:00
Scott MacVicar
c2b15e947d
MFH Replace magic values with a define for json encoding, makes reading it a bit easier
2009-03-17 23:26:02 +00:00
Scott MacVicar
8d2a5cabec
MFH Add PHP_JSON_FORCE_OBJECT for forcing an object output of an array
2009-03-17 23:15:40 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Scott MacVicar
7fe245af85
MFH Make sure we clear out the error when the scalar version decoding works.
2008-12-24 18:09:09 +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
Scott MacVicar
8ef7fe1d99
Update the JSON parser with that on json.org, biggest change here is code readability. Less magic numbers in the state table.
...
Add missing reflection information to json_encode()
Fixes bug #45791 with 0e0 not being supported as a value
Error values are stored when encountered during parsing
2008-12-17 14:40:06 +00:00
Scott MacVicar
ed5f04710b
MFH Fix bug #45989 - json_decode() doesn't return NULL on certain invalid strings
2008-12-12 23:19:47 +00:00
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +00:00
Felipe Pena
604c7f6ad2
- MFH: Fixed bug #46215 (json_encode mutates its parameter and has some class-specific state)
2008-10-02 03:36:20 +00:00
Jani Taskinen
4e2ed54d15
ws + cs
2008-07-22 15:30:03 +00:00
Felipe Pena
cb0d08699d
- Added arginfo
2008-06-27 19:16:17 +00:00
Dmitry Stogov
1a41611372
ZTS fix
2008-01-30 08:10:17 +00:00
Stanislav Malyshev
b4443f35ff
fix #43941 : invalid utf-8 not accepted
2008-01-30 03:17:57 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Sara Golemon
cce03434ef
MFH (json.c r-1.32) Add support for encoding options
2007-12-17 07:48:27 +00:00
Ilia Alshanetsky
36cf6a2b05
Fixed bug #42785 (json_encode() formats doubles according to locale rather
...
then following standard syntax).
2007-10-01 15:22:41 +00:00
Dmitry Stogov
6c810b0d4c
Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)
2007-09-27 18:00:48 +00:00
Hannes Magnusson
e3b8cf0f66
MFH: Fixed bug#42090 (json_decode causes segmentation fault)
2007-07-24 22:57:13 +00:00
Antony Dovgal
17ee976404
fix ws/folding
2007-07-23 12:24:52 +00:00
Ilia Alshanetsky
9f28e21bb1
Fixed bug #41673 (json_encode breaks large numbers in arrays).
2007-06-13 17:07:58 +00:00
Ilia Alshanetsky
045b283a7d
Fixed bug #41567 (json_encode() double conversion is inconsistent with PHP).
2007-06-04 23:51:32 +00:00
Hannes Magnusson
de4408c9af
MFH: protos (patch by jeffg at activestate dot com)
2007-05-25 13:24:50 +00:00
Andrei Zmievski
b62d120580
Fix processing of control characters; they should be escaped as \u
...
sequences.
2007-04-13 21:34:12 +00:00
Ilia Alshanetsky
a133297c86
Fixed bug #41034 (json_encode() ignores null byte started keys in arrays)
2007-04-12 19:40:38 +00:00
Ilia Alshanetsky
5e274ea47d
Fixed bug #40503 (json_encode() value corruption on 32bit systems with
...
overflown values).
2007-02-18 16:54:59 +00:00