summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-062-77/+38
| | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.
* Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-062-38/+77
| | | | I don't want use zend_try here, but seems I have no choice :<
* Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-223-1/+34
|
* Update test scriptXinchen Hui2016-03-221-0/+10
|
* Fix bug #71835 (json_encode sometimes incorrectly detects recursion with ↵Jakub Zelenka2016-03-201-0/+17
| | | | JsonSerializable)
* Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | Also re bug #71575.
* Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
|
* Happy new year (Update copyright to 2016)Lior Kaplan2016-01-018-8/+8
|
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-012-2/+2
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2015-11-1532-253/+185
|\ \ | |/
| * Use the same CS for all json testsJakub Zelenka2015-11-1532-252/+185
| |
* | Simplify JSON constants registrationJakub Zelenka2015-09-041-26/+33
| |
* | Add my name to authors for previous refactoringJakub Zelenka2015-09-041-0/+1
| | | | | | | | Related to jsond changes
* | Move json_decode options macros bellow encode optionsJakub Zelenka2015-09-041-4/+4
| |
* | json: fix formating of PHP_JSON* option bitshiftsRyan McCullagh2015-09-041-12/+12
| |
* | these need to be exported for extensions that use jsonJoe Watkins2015-09-032-2/+2
| |
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+3
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-212-0/+43
|\ \ | |/ | | | | | | * PHP-5.6: Add tests for json_last_error()/json_last_error_msg() failures
| * Add tests for json_last_error()/json_last_error_msg() failuresKubo22015-07-212-0/+43
| |
| * Merge remote-tracking branch 'github/pr/637' into PHP-5.6Stanislav Malyshev2015-04-186-219/+2
| |\ | | | | | | | | | | | | * github/pr/637: Remove unused code from ext/json.
| | * Remove unused code from ext/json.Rouven Weßling2014-03-304-199/+2
| | |
* | | Regenerate bison and re2c files in jsonJakub Zelenka2015-07-184-1141/+1022
| | |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-307-1033/+1152
| | | | | | | | | | | | semantick changes).
* | | Fix incompatible JSON errorsJakub Zelenka2015-06-283-486/+662
| | | | | | | | | | | | | | | | | | | | | This fixes differences in error codes with PHP 5 and 7. The malformed UTF-8 and control character error codes are now returned even in non-string context which makes it the same as it was in PHP 5 json ext.
* | | Fix bug #62010 (json_decode produces invalid byte-sequences)Jakub Zelenka2015-06-284-209/+250
| | |
* | | Bump re2c version for json scannerJakub Zelenka2015-06-283-3/+3
| | |
* | | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-215-11/+60
| | |
* | | Improve json parser codeJakub Zelenka2015-06-072-38/+147
| | |
* | | Tidy up and regenerate json parser with latest bison versionJakub Zelenka2015-05-103-767/+717
| | |
* | | Optimized json_parserXinchen Hui2015-05-063-749/+799
| | | | | | | | | | | | | | | | | | 1. use zend_string in key 2. use faster APIs 3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy)
* | | Use Z_ARRVAL_P since we already know it's an arrayXinchen Hui2015-05-061-3/+3
| | |
* | | fix datatype mismatchesAnatol Belski2015-03-253-3/+3
| | |
* | | s/PHP Version 5/PHP Version 7/gLior Kaplan2015-03-137-7/+7
| | | | | | | | | | | | Follow up for d0cb7153
* | | Improved php_json_escape_string()Dmitry Stogov2015-03-111-98/+103
| | |
* | | ZTS cleanupReeze Xia2015-03-082-2/+2
| | |
* | | Added test for bug 69187Hugo Fonseca2015-03-071-0/+33
| | |
* | | Merge branch 'PHP-5.6'Jakub Zelenka2015-02-222-17/+38
|\ \ \ | |/ / | | | | | | The fix for master is a bit different (it's fixed in encoder)
| * | Merge branch 'PHP-5.5' into PHP-5.6Jakub Zelenka2015-02-222-17/+27
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ext/json/json.c
| | * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers ↵Jakub Zelenka2015-02-222-11/+21
| | | | | | | | | | | | | | | | plus the letter e)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-043-19/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: Revert "json_decode() should generate a syntax error when given ""." Update NEWS
| | * | Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-043-19/+2
| | | | | | | | | | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.
* | | | Set PHP_JSON_VERSION to 1.4.0Jakub Zelenka2015-02-171-1/+1
| | | |
* | | | Delete json outdated package.xmlJakub Zelenka2015-02-161-152/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The package.xml has not been update for more then 8 years and there is no reason to keep it. It would require quite a bit of digging in git history to update it which is not worth it.
* | | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-2/+2
| | | | | | | | | | | | | | | | which also comply with the current semantics for such macros
* | | | Update JSON ReadmeJakub Zelenka2015-02-151-70/+10
| | | |
* | | | Remove unused destructor in json parserJakub Zelenka2015-02-152-5/+4
| | | |
* | | | Add bison 3.0.4 genereted files for json parserJakub Zelenka2015-02-152-0/+1955
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions file (json_parser.tab.h) contains file system dependent name for C preprocessor guard: YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED This is because the srcdir is used for default definitions name. It's a correct default (--definition=$(srcdir)/json_parser.tab.h) because the build would fail otherwise. Unfortunately Bison does not have a special option for defining cpp guard name. The only way would be using skeleton file but that's not possible with the current configuration as it requires using a specific bison version (disallowing range of supported versions).
* | | | Regenerate json scanner with re2c 0.13.7.5Jakub Zelenka2015-02-152-2/+2
| | | |
* | | | better alignment + support size_tAnatol Belski2015-02-104-465/+464
| | | |
View Lorry Controller Status