Commit graph

34 commits

Author SHA1 Message Date
Dmitry Stogov
918a9f09f8 Use zval_ptr_dtor_nogc() in JSON parser (it can't produce circular data structures) 2018-07-05 15:07:16 +03:00
Dmitry Stogov
5eb1f92f31 Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence. 2018-05-28 16:27:12 +03:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
d56a534acc RC manipulation cleanup 2 2017-11-02 12:13:35 +08:00
Anatol Belski
3b2e8f8f70 Sync json parser defs 2017-09-20 15:08:45 +02:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Jakub Zelenka
f0d1cca672 Use empty keys instead of _empty_ in json decoding 2016-06-20 19:44:00 +01:00
Jakub Zelenka
b91c05ea14 Fix and clean up exporting of json parser 2016-05-11 20:54:42 +01:00
Jakub Zelenka
37048c0f6c Use embedded json parser method structure 2016-05-02 13:02:40 +01:00
Jakub Zelenka
93b67dd511 Remove json parser depth methods and tidy it up 2016-04-10 16:10:26 +01:00
Jakub Zelenka
72ccfda25a Add method hooking support to json parser
This commit is just a slight modification (renaming and some small
changes) of the patch that has been provided by Andrey Hristov.
It adds support for hooking of the json parser operations and
allows re-using of modified JSON parsing outside of json ext.
2016-04-10 15:35:41 +01:00
Lior Kaplan
2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Jakub Zelenka
f3df3df873 Fix bug #68546 (json_decode cannot access property started with \0) 2015-06-21 15:30:33 +01:00
Jakub Zelenka
61de771afa Improve json parser code 2015-06-07 15:22:09 +01:00
Jakub Zelenka
359df4dea8 Tidy up and regenerate json parser with latest bison version 2015-05-10 18:08:16 +01:00
Xinchen Hui
76fb02123f Optimized json_parser
1. use zend_string in key
2. use faster APIs
3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy)
2015-05-06 11:37:30 +08:00
Anatol Belski
fe36285de2 fix datatype mismatches 2015-03-25 15:32:35 +01:00
Lior Kaplan
a4384bd3d4 s/PHP Version 5/PHP Version 7/g
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Reeze Xia
609f05fc19 ZTS cleanup 2015-03-08 19:25:55 +08:00
Jakub Zelenka
549c6fa465 Remove unused destructor in json parser 2015-02-15 19:46:41 +00:00
Anatol Belski
ef2fd13de8 fix datatype mismatches 2015-02-09 11:06:02 +01:00
Anatol Belski
12fff5251b fix inconsistend dll linkage warn 2015-02-09 10:51:29 +01:00
Anatol Belski
a1208b4726 use size_t for str length 2015-02-09 10:43:27 +01:00
Jakub Zelenka
3159d518d0 Merge branch 'master' into jsond
Conflicts:
	ext/json/JSON_parser.c
	ext/json/json.c
2015-01-25 18:43:15 +00:00
Jakub Zelenka
8e10250449 Use ZVAL_COPY_VALUE for copying parser result to return_value 2015-01-01 19:19:31 +00:00
Jakub Zelenka
b68da91d52 Merge branch 'master' into jsond
Conflicts:
	ext/json/JSON_parser.c
	ext/json/JSON_parser.h
	ext/json/config.m4
	ext/json/config.w32
	ext/json/json.c
	ext/json/php_json.h
2014-12-27 19:42:04 +00:00
Jakub Zelenka
9e5f687957 Fix json object decoding 2014-12-12 19:52:45 +00:00
Jakub Zelenka
c6d0905158 Do not copy return_value in parser 2014-12-07 20:27:03 +00:00
Jakub Zelenka
098097d83f Fix compilation for json scanner 2014-11-30 18:29:48 +00:00
Jakub Zelenka
79e8355631 Fix compilation issues in json_parser 2014-11-26 20:49:55 +00:00
Jakub Zelenka
f00b80a511 Implement initial changes for json_parser 2014-11-23 19:53:06 +00:00
Jakub Zelenka
ba70ba5f13 Replace INIT_PZVAL_COPY with ZVAL_DUP 2014-11-16 15:21:01 +00:00
Jakub Zelenka
d07bf91328 Initial import of jsond 2014-11-13 20:20:46 +00:00