17 Commits

Author	SHA1	Message	Date
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
Xinchen Hui	9f0dbdf6c8	Use Z_ARRVAL_P since we already know it's an array	2015-05-06 11:10:33 +08:00
Anatol Belski	fe36285de2	fix datatype mismatches	2015-03-25 15:32:35 +01:00
Dmitry Stogov	d68861eb4b	Improved php_json_escape_string()	2015-03-11 15:03:07 +03:00
Jakub Zelenka	ad2b751985	Merge branch 'PHP-5.6' ... The fix for master is a bit different (it's fixed in encoder)	2015-02-22 20:54:05 +00:00
Michael Wallner	09a3e7377a	fix json globals	2015-02-09 17:57:18 +01:00
Anatol Belski	fc5b349789	size_t vs int	2015-02-09 10:47:39 +01:00
Jakub Zelenka	f2825042b4	Merge branch 'master' into jsond ... Conflicts: ext/json/json.c	2015-02-08 14:08:31 +00:00
Jakub Zelenka	20bae2a503	Give me credit	2015-02-02 19:33:48 +00: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	3ddb5993dd	Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part ... This is probably not necessary as such number is not realistic. It's just to be consistent with jsond extension.	2015-01-18 16:31:24 +00:00
Juan Basso	95cef47afb	Porting implementation of RFC json_preserve_fractional_part	2015-01-12 21:29:52 -05:00
Jakub Zelenka	e6fb493e5d	Refactore json double encoding to use php_gcvt	2015-01-11 13:30:21 +00:00
Jakub Zelenka	8304e468cd	Replace encoder functions json prefix with php_json	2015-01-10 19:13:28 +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	f18aae6042	Fix compilation for json_encoder	2014-11-30 17:47:17 +00:00
Jakub Zelenka	e18dd67975	Move json encoding stuff	2014-11-24 20:46:13 +00:00