| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Introduce json encoder to fix globals related issues | Jakub Zelenka | 2016-10-30 | 2 | -0/+40 |
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Julien Pauli | 2016-09-19 | 2 | -1/+24 |
| |\ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Julien Pauli | 2016-09-19 | 1 | -0/+24 |
| | |\ | |||||
| | | * | Do not wrap user exception in case of custom JSON serialization | Julien Pauli | 2016-09-19 | 1 | -0/+24 |
| * | | | Add test for fixed bug #68992 | Jakub Zelenka | 2016-08-29 | 1 | -0/+30 |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-08-14 | 1 | -0/+15 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-5.6' into PHP-7.0 | Jakub Zelenka | 2016-08-14 | 1 | -0/+15 |
| | |\ \ | | |/ | |||||
| | | * | Fixed bug #72787 (json_decode reads out of bounds) | Jakub Zelenka | 2016-08-14 | 1 | -0/+15 |
| * | | | Fixed test according to FR #46600 ("_empty_" key in objects) | Dmitry Stogov | 2016-06-22 | 1 | -3/+3 |
| * | | | Use empty keys instead of _empty_ in json decoding | Jakub Zelenka | 2016-06-20 | 3 | -9/+9 |
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-06 | 1 | -32/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)" | Xinchen Hui | 2016-05-06 | 1 | -32/+0 |
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-06 | 1 | -0/+32 |
| |\ \ \ | |/ / | |||||
| | * | | Fixed bug #72170 (JsonSerializable may inc apply count without dec it) | Xinchen Hui | 2016-05-06 | 1 | -0/+32 |
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-22 | 1 | -0/+29 |
| |\ \ \ | |/ / | |||||
| | * | | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 1 | -0/+29 |
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-03-22 | 1 | -0/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Update test script | Xinchen Hui | 2016-03-22 | 1 | -0/+10 |
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-03-21 | 1 | -0/+17 |
| |\ \ \ | |/ / | |||||
| | * | | Fix bug #71835 (json_encode sometimes incorrectly detects recursion with Json... | Jakub Zelenka | 2016-03-20 | 1 | -0/+17 |
| * | | | json_encode: Escape U+2028 and U+2029 more often. | Eddie Kohler | 2016-01-22 | 1 | -0/+36 |
| |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Jakub Zelenka | 2015-11-15 | 32 | -253/+185 |
| |\ \ | |/ | |||||
| | * | Use the same CS for all json tests | Jakub Zelenka | 2015-11-15 | 32 | -252/+185 |
| * | | Merge branch 'PHP-5.6' | Christoph M. Becker | 2015-07-21 | 2 | -0/+43 |
| |\ \ | |/ | |||||
| | * | Add tests for json_last_error()/json_last_error_msg() failures | Kubo2 | 2015-07-21 | 2 | -0/+43 |
| * | | Fix incompatible JSON errors | Jakub Zelenka | 2015-06-28 | 1 | -0/+16 |
| * | | Fix bug #62010 (json_decode produces invalid byte-sequences) | Jakub Zelenka | 2015-06-28 | 1 | -0/+15 |
| * | | Fix bug #68546 (json_decode cannot access property started with \0) | Jakub Zelenka | 2015-06-21 | 1 | -0/+25 |
| * | | Added test for bug 69187 | Hugo Fonseca | 2015-03-07 | 1 | -0/+33 |
| * | | Merge branch 'PHP-5.6' | Jakub Zelenka | 2015-02-22 | 1 | -0/+14 |
| |\ \ | |/ | |||||
| | * | Merge branch 'PHP-5.5' into PHP-5.6 | Jakub Zelenka | 2015-02-22 | 1 | -0/+14 |
| | |\ | |||||
| | | * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p... | Jakub Zelenka | 2015-02-22 | 1 | -0/+14 |
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 2 | -18/+2 |
| | |\ \ | | |/ | |||||
| | | * | Revert "json_decode() should generate a syntax error when given ""." | Julien Pauli | 2015-02-04 | 2 | -18/+2 |
| * | | | Fix invalid test for bug 54484 | Jakub Zelenka | 2015-02-02 | 1 | -1/+1 |
| * | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-02 | 2 | -2/+18 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'PHP-5.6' | Adam Harvey | 2015-02-02 | 2 | -2/+18 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 2 | -2/+18 |
| | | |\ \ | | | |/ | |||||
| | | | * | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 2 | -2/+18 |
| * | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -0/+17 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-19 | 1 | -0/+60 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Fixed bug #50224 where float without decimals were converted to integer | Juan Basso | 2015-01-19 | 1 | -0/+60 |
| | * | | | Fix bug #68817: Null pointer deference | Stanislav Malyshev | 2015-01-14 | 1 | -0/+17 |
| * | | | | Porting implementation of RFC json_preserve_fractional_part | Juan Basso | 2015-01-12 | 1 | -0/+60 |
| * | | | | Modify json/tests/pass003 to ignore internal object ID | Jakub Zelenka | 2014-12-12 | 1 | -5/+5 |
| |/ / / | |||||
| * | | | Port JSON | Nikita Popov | 2014-05-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+20 |
| |\ \ | |/ | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+20 |
| | |\ | |||||
| | | * | Merge branch 'pull-request/518' into PHP-5.4 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+20 |
| | | |\ | |||||
| | | | * | Fix #66021 (Blank line inside empty array/object) | Kevin Israel | 2013-11-02 | 1 | -0/+20 |
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |