Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php | Sebastian Bergmann | 2010-01-03 | 2 | -2/+2 |
| | |||||
* | Fix broken json tests in all branches | Rasmus Lerdorf | 2009-08-03 | 3 | -35/+19 |
| | |||||
* | Fix 2 broken json tests. | Rasmus Lerdorf | 2009-07-26 | 2 | -6/+6 |
| | | | | | | | | json_decode() returns a binary string, not unicode for efficiency, and if you are going to test invalid utf8 in a test, you have to stuff it into a binary string or it will be valid unicode by definition. | ||||
* | There is no error code set for json_last_error if an invalid utf8 | Rasmus Lerdorf | 2009-07-22 | 2 | -0/+4 |
| | | | | | | 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 |
| | |||||
* | The json header should be installed so other exts can use it | Johannes Schlüter | 2009-06-23 | 1 | -0/+1 |
| | |||||
* | New json extension tests. Tested on Windows, Linux and Linux 64 bit. | andy wharmby | 2009-06-14 | 5 | -0/+450 |
| | |||||
* | - No dots in error messages | Jani Taskinen | 2009-05-31 | 1 | -3/+3 |
| | |||||
* | Make a note. | Andrei Zmievski | 2009-05-31 | 1 | -0/+6 |
| | |||||
* | MFB: Cast to unsigned char to prevent compiler warning | Kalle Sommer Nielsen | 2009-05-19 | 1 | -1/+1 |
| | |||||
* | 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 | 3 | -7/+14 |
| | | | | for now. It might make sense to allow an unbound depth. | ||||
* | MFB Rebuild credits, was missed in previous RC | Scott MacVicar | 2009-04-02 | 1 | -1/+1 |
| | |||||
* | Avoid 2 conversions when decoding numbers | Matt Wilmas | 2009-03-19 | 1 | -6/+17 |
| | |||||
* | Missing skip in tests | Scott MacVicar | 2009-03-17 | 1 | -0/+2 |
| | |||||
* | 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 | 2 | -1/+13 |
| | |||||
* | Deal with overflow when decoding large numbers | Scott MacVicar | 2009-03-17 | 1 | -2/+3 |
| | |||||
* | Fix bug #47644 - Valid integers are truncated with json_decode() | Scott MacVicar | 2009-03-17 | 2 | -4/+47 |
| | |||||
* | - This is PHP 6 - if this ... ever gets out | Marcus Boerger | 2009-03-10 | 2 | -2/+2 |
| | |||||
* | Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64 | andy wharmby | 2009-01-23 | 1 | -0/+6 |
| | |||||
* | Fix bug #46944 - UTF-8 characters outside the BMP aren't encoded correctly. | Scott MacVicar | 2009-01-02 | 2 | -2/+2 |
| | |||||
* | Bump copyright year, 3 of 3. | Sebastian Bergmann | 2008-12-31 | 2 | -2/+2 |
| | |||||
* | 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 | 5 | -29/+108 |
| | | | | | | | during a decode, also fixes a segfault when we have [1} [DOC] | ||||
* | Fix Windows build | Scott MacVicar | 2008-12-17 | 1 | -0/+3 |
| | |||||
* | Test for bug #45791 | Scott MacVicar | 2008-12-17 | 1 | -0/+13 |
| | |||||
* | Update the JSON parser with that on json.org, biggest change here is code ↵ | Scott MacVicar | 2008-12-17 | 3 | -602/+639 |
| | | | | | | | | | 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 | 5 | -82/+69 |
| | |||||
* | Changed logic for LONG_MIN | Matt Wilmas | 2008-12-02 | 1 | -1/+1 |
| | |||||
* | - Fixed tests | Felipe Pena | 2008-11-19 | 1 | -0/+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 |
| | |||||
* | - New test | Felipe Pena | 2008-10-02 | 1 | -0/+23 |
| | |||||
* | - Fixed bug #46215 (json_encode mutates its parameter and has some ↵ | Felipe Pena | 2008-10-02 | 1 | -0/+3 |
| | | | | class-specific state) | ||||
* | Fix test to test higher nesting level | Rasmus Lerdorf | 2008-07-31 | 1 | -4/+4 |
| | |||||
* | We can afford a larger stack here and other json parsers out there | Rasmus Lerdorf | 2008-07-30 | 1 | -1/+1 |
| | | | | | go deeper than 128. | ||||
* | 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.. | ||||
* | MFB: sync | Jani Taskinen | 2008-07-22 | 1 | -5/+0 |
| | |||||
* | ws + cs + sync with PHP_5_3 | Jani Taskinen | 2008-07-22 | 1 | -117/+100 |
| | |||||
* | - Add missing tests (thanks for being so fucking lazy Ilia!) | Jani Taskinen | 2008-07-22 | 2 | -0/+46 |
| | |||||
* | - MFB: Added arginfo | Felipe Pena | 2008-06-27 | 1 | -2/+15 |
| | |||||
* | - killed off UEXPECT | Steph Fox | 2008-05-27 | 16 | -2713/+7 |
| | | | | | | - com_dotnet gets a .cvsignore - Ulf will take care of mysql extensions, rest complete | ||||
* | - Added some UEXPECTs | Felipe Pena | 2008-03-22 | 1 | -0/+4 |
| | | | | | - Fixed some tests | ||||
* | FIxed tests (new error message - E_DEPRECATED) | Felipe Pena | 2008-02-23 | 1 | -1/+1 |
| | |||||
* | cosmetic fix | Antony Dovgal | 2008-02-15 | 1 | -1/+1 |
| | |||||
* | ZTS fix | Dmitry Stogov | 2008-01-30 | 1 | -4/+4 |
| | |||||
* | fix #43941: invalid utf-8 not accepted | Stanislav Malyshev | 2008-01-30 | 3 | -5/+31 |
| |