Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php | Sebastian Bergmann | 2010-01-03 | 1 | -1/+1 |
| | |||||
* | There is no error code set for json_last_error if an invalid utf8 | Rasmus Lerdorf | 2009-07-22 | 1 | -0/+3 |
| | | | | | | sequence is encountered. This fixes that. Might be worthwhile to merge to 5.3 despite the new constant. | ||||
* | - Fixed memleak when depth arg is less than zero | Felipe Pena | 2009-06-24 | 1 | -0/+1 |
| | |||||
* | - No dots in error messages | Jani Taskinen | 2009-05-31 | 1 | -3/+3 |
| | |||||
* | Make a note. | Andrei Zmievski | 2009-05-31 | 1 | -0/+6 |
| | |||||
* | Fix arginfo | Kalle Sommer Nielsen | 2009-05-15 | 1 | -1/+2 |
| | |||||
* | Throw an error rather than silently changing to the default. | Scott MacVicar | 2009-05-14 | 1 | -1/+2 |
| | |||||
* | Allow the json_decode() depth to be any size, but keep the static one around ↵ | Scott MacVicar | 2009-05-14 | 1 | -4/+3 |
| | | | | for now. It might make sense to allow an unbound depth. | ||||
* | Replace magic values with a define, makes reading it a bit easier | Scott MacVicar | 2009-03-17 | 1 | -7/+10 |
| | |||||
* | Add PHP_JSON_FORCE_OBJECT for forcing an object output of an array | Scott MacVicar | 2009-03-17 | 1 | -1/+3 |
| | |||||
* | - This is PHP 6 - if this ... ever gets out | Marcus Boerger | 2009-03-10 | 1 | -1/+1 |
| | |||||
* | Bump copyright year, 3 of 3. | Sebastian Bergmann | 2008-12-31 | 1 | -1/+1 |
| | |||||
* | Make sure we clear out the error when the scalar version decoding works. | Scott MacVicar | 2008-12-24 | 1 | -0/+12 |
| | |||||
* | Add json_last_error() for getting a bit of information about what failed ↵ | Scott MacVicar | 2008-12-19 | 1 | -9/+41 |
| | | | | | | | during a decode, also fixes a segfault when we have [1} [DOC] | ||||
* | Update the JSON parser with that on json.org, biggest change here is code ↵ | Scott MacVicar | 2008-12-17 | 1 | -23/+31 |
| | | | | | | | | | 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 | ||||
* | Fix bug #45989 - json_decode() doesn't return NULL on certain invalid strings | Scott MacVicar | 2008-12-12 | 1 | -14/+2 |
| | |||||
* | - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro (again!) | Felipe Pena | 2008-11-17 | 1 | -2/+0 |
| | |||||
* | - Revert ZEND_BEGIN_ARG_INFO change | Felipe Pena | 2008-11-02 | 1 | -0/+2 |
| | |||||
* | - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro | Felipe Pena | 2008-10-24 | 1 | -2/+0 |
| | |||||
* | - Fixed bug #46215 (json_encode mutates its parameter and has some ↵ | Felipe Pena | 2008-10-02 | 1 | -0/+3 |
| | | | | class-specific state) | ||||
* | MFB:-Â Fixed bug #38680 (Added missing handling of basic types in json_decode) | Jani Taskinen | 2008-07-22 | 1 | -0/+4 |
| | | | | | | # This was claimed to be in HEAD but wasn't..some commit reverted it or # someone didn't check for real.. | ||||
* | ws + cs + sync with PHP_5_3 | Jani Taskinen | 2008-07-22 | 1 | -117/+100 |
| | |||||
* | - MFB: Added arginfo | Felipe Pena | 2008-06-27 | 1 | -2/+15 |
| | |||||
* | ZTS fix | Dmitry Stogov | 2008-01-30 | 1 | -4/+4 |
| | |||||
* | fix #43941: invalid utf-8 not accepted | Stanislav Malyshev | 2008-01-30 | 1 | -4/+9 |
| | |||||
* | Bump copyright year, 2 of 2. | Sebastian Bergmann | 2007-12-31 | 1 | -1/+1 |
| | |||||
* | Add support for encoding options | Sara Golemon | 2007-12-17 | 1 | -15/+74 |
| | |||||
* | MFB: Fixed bug #42785 (json_encode() formats doubles according to locale | Ilia Alshanetsky | 2007-10-01 | 1 | -3/+3 |
| | | | | | rather then following standard syntax). | ||||
* | Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) | Dmitry Stogov | 2007-09-27 | 1 | -1/+1 |
| | |||||
* | spaces -> tabs | Jan Lehnardt | 2007-09-01 | 1 | -302/+302 |
| | |||||
* | Fixed bug#42090 (json_decode causes segmentation fault) | Hannes Magnusson | 2007-07-24 | 1 | -2/+2 |
| | |||||
* | MFB: Fixed bug #41673 (json_encode breaks large numbers in arrays). | Ilia Alshanetsky | 2007-06-13 | 1 | -8/+2 |
| | |||||
* | MFB: Fixed bug #41567 (json_encode() double conversion is inconsistent with | Ilia Alshanetsky | 2007-06-04 | 1 | -1/+1 |
| | | | | | PHP). | ||||
* | MFB fix for #41034 | Antony Dovgal | 2007-04-23 | 1 | -1/+1 |
| | | | | | add missing tests | ||||
* | MFB (handling of control characters) | Andrei Zmievski | 2007-04-16 | 1 | -1/+1 |
| | |||||
* | MFB: #40503 (json_encode() value corruption on 32bit systems with overflown ↵ | Antony Dovgal | 2007-02-19 | 1 | -8/+8 |
| | | | | values) | ||||
* | Bump year. | Sebastian Bergmann | 2007-01-01 | 1 | -1/+1 |
| | |||||
* | MFB: safety checks | Ilia Alshanetsky | 2006-12-26 | 1 | -2/+2 |
| | |||||
* | MFB: little cleanup in json_determine_array_type() | Nuno Lopes | 2006-12-19 | 1 | -8/+1 |
| | |||||
* | Clarify why the result of json_encode() is a binary string. | Andrei Zmievski | 2006-10-19 | 1 | -0/+4 |
| | |||||
* | fix folding tags, nuke json globals | Antony Dovgal | 2006-10-19 | 1 | -7/+13 |
| | |||||
* | fix coverity issue #262 (uninitialized variable) | Antony Dovgal | 2006-10-19 | 1 | -0/+1 |
| | |||||
* | Unicode support in JSON functions. | Andrei Zmievski | 2006-10-17 | 1 | -67/+114 |
| | |||||
* | Patch to support primitive types. (Ilia) | Andrei Zmievski | 2006-10-16 | 1 | -1/+26 |
| | |||||
* | MFB | Nuno Lopes | 2006-07-22 | 1 | -1/+1 |
| | |||||
* | use E_WARNING on recursion and add null to the result to keep it valid | Antony Dovgal | 2006-07-20 | 1 | -1/+2 |
| | |||||
* | add recursion protection to json_encode() and new tests | Antony Dovgal | 2006-07-20 | 1 | -0/+15 |
| | |||||
* | json_escape_string() doesn't use tsrm_ls, so no need to pass it | Antony Dovgal | 2006-07-20 | 1 | -4/+4 |
| | |||||
* | MFB: Fixed compiler warnings and enable Json by default. | Ilia Alshanetsky | 2006-07-19 | 1 | -3/+1 |
| | |||||
* | Fix PECL bug #7147 - rework comma insertion whilst encoding. | Omar Kilani | 2006-03-18 | 1 | -7/+19 |
| | | | | | Add tests to package.xml. |