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
Antony Dovgal
e8d2c9489d
MFH: nuke skeleton leftovers
2007-01-12 12:17:32 +00:00
Sebastian Bergmann
4223aa4d5e
MFH: Bump year.
2007-01-01 09:36:18 +00:00
Ilia Alshanetsky
7efb0a14f4
Use safe_emalloc()
2006-12-25 21:41:04 +00:00
Nuno Lopes
078fda3d6e
remove NOP code in json_determine_array_type(), as we already know the zval passed is an array (based on patch by Ron Korving)
2006-12-19 15:01:05 +00:00
Ilia Alshanetsky
57f295d3a6
Fixed bug #38680 (Added missing handling of basic types in json_decode).
...
# already in HEAD
2006-11-03 13:16:33 +00:00
Nuno Lopes
ddb4d1fdcc
move static declaration to *.c files
...
mroe static/const keywording
2006-08-14 20:08:18 +00:00
Nuno Lopes
ff591e2cf0
more const keywording
2006-07-22 15:22:56 +00:00
Antony Dovgal
3003cd2473
MFH: use E_WARNING on recursion and add null to the result to keep it valid
2006-07-20 09:33:28 +00:00
Antony Dovgal
3e308d3a6b
MFH: add recursion protection to json_encode() and new tests
2006-07-20 08:56:57 +00:00
Antony Dovgal
074feedc2b
MFH
2006-07-20 07:40:49 +00:00
Ilia Alshanetsky
cdfe00b801
Fixed compiler warnings and enable Json by default.
2006-07-19 16:17:15 +00:00
SVN Migration
608baa409a
This commit was manufactured by cvs2svn to create branch 'PHP_5_2'.
2006-05-05 15:49:42 +00:00
