| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 2 | -2/+2 |
| * | Use the same CS for all json tests | Jakub Zelenka | 2015-11-15 | 32 | -252/+185 |
| * | Add tests for json_last_error()/json_last_error_msg() failures | Kubo2 | 2015-07-21 | 2 | -0/+43 |
| * | Merge remote-tracking branch 'github/pr/637' into PHP-5.6 | Stanislav Malyshev | 2015-04-18 | 6 | -219/+2 |
| |\ | |||||
| | * | Remove unused code from ext/json. | Rouven Weßling | 2014-03-30 | 4 | -199/+2 |
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Jakub Zelenka | 2015-02-22 | 2 | -17/+27 |
| |\ \ | |||||
| | * | | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p... | Jakub Zelenka | 2015-02-22 | 2 | -11/+21 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 3 | -19/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "json_decode() should generate a syntax error when given ""." | Julien Pauli | 2015-02-04 | 3 | -19/+2 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 3 | -2/+19 |
| |\ \ \ | |/ / | |||||
| | * | | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 3 | -2/+19 |
| | * | | Bump year | Xinchen Hui | 2015-01-15 | 2 | -2/+2 |
| * | | | Fixed bug #50224 where float without decimals were converted to integer | Juan Basso | 2015-01-19 | 3 | -8/+90 |
| * | | | bump year | Xinchen Hui | 2015-01-15 | 2 | -2/+2 |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-08-17 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-08-17 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | typofixes | Veres Lajos | 2014-08-17 | 1 | -1/+1 |
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 2 | -8/+30 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 2 | -8/+30 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'pull-request/518' into PHP-5.4 | Stanislav Malyshev | 2014-04-13 | 2 | -8/+30 |
| | | |\ | |||||
| | | | * | Fix #66021 (Blank line inside empty array/object) | Kevin Israel | 2013-11-02 | 2 | -8/+30 |
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Julien Pauli | 2014-02-17 | 2 | -2/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Export JsonSerializable Interface (bug #65753) | Julien Pauli | 2014-02-17 | 2 | -2/+2 |
| | | * | | Bump year | Xinchen Hui | 2014-01-03 | 2 | -2/+2 |
| | * | | | Bump year | Xinchen Hui | 2014-01-03 | 2 | -2/+2 |
| * | | | | Export JsonSerializable Interface (bug #65753) | Julien Pauli | 2014-02-17 | 2 | -2/+2 |
| * | | | | Bump year | Xinchen Hui | 2014-01-03 | 2 | -2/+2 |
| * | | | | Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi... | Andrea Faulds | 2013-11-11 | 2 | -3/+72 |
| |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2013-11-10 | 2 | -8/+139 |
| |\ \ \ | |/ / | |||||
| | * | | Better test: Check combined leading/trailing | Andrea Faulds | 2013-10-15 | 1 | -0/+66 |
| | * | | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case... | Andrea Faulds | 2013-09-17 | 2 | -8/+73 |
| | |/ | |||||
| | * | Happy New Year | Xinchen Hui | 2013-01-01 | 2 | -2/+2 |
| * | | HASH_KEY_NON_EXISTANT fix | Veres Lajos | 2013-07-21 | 1 | -2/+2 |
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 2 | -2/+2 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2012-12-11 | 2 | -3/+60 |
| |\ \ | |/ | |||||
| | * | Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers. | Adam Harvey | 2012-12-11 | 2 | -3/+60 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2012-11-26 | 1 | -17/+22 |
| |\ \ | |/ | |||||
| | * | Related bug #63588 fix length computation + optimize for speed | Remi Collet | 2012-11-26 | 1 | -17/+22 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2012-11-25 | 5 | -67/+31 |
| |\ \ | |/ | |||||
| | * | Fixed bug #63588 Duplicate implementation of php_next_utf8_char | Remi Collet | 2012-11-25 | 5 | -67/+31 |
| | * | Revert JSON merges to 5.4 | Nikita Popov | 2012-07-01 | 16 | -232/+47 |
| * | | Fix 64bit JSON test | Nikita Popov | 2012-08-13 | 1 | -2/+2 |
| * | | Fix test failed due to new feature introduced in 45d596ea | Xinchen Hui | 2012-07-29 | 2 | -4/+2 |
| * | | Add optional depth parameter to json_encode #62369 | Florian Anderiasch | 2012-07-24 | 3 | -1/+44 |
| |/ | |||||
| * | fix bug #61359: json_encode() calls too many reallocs | Stanislav Malyshev | 2012-06-30 | 1 | -9/+12 |
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2012-06-28 | 8 | -42/+51 |
| |\ | |||||
| | * | Add json_last_error_msg() function | Nikita Popov | 2012-06-28 | 8 | -42/+51 |
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2012-06-27 | 11 | -58/+113 |
| |\ \ | |/ | |||||
| | * | Improve JSON error handling | Nikita Popov | 2012-06-27 | 8 | -49/+92 |
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2012-06-23 | 14 | -26/+147 |
| |\ \ | |/ | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |