1
0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Commit Graph

8 Commits

Author SHA1 Message Date
Anatol Belski ca9ab1c993 better alignment + support size_t 2015-02-10 16:02:55 +01:00
Anatol Belski 4a875e18fd use portable strtol 2015-02-10 13:06:57 +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 1119c4d2b2 Allow ill-formed unicode escapes in decoder 2015-01-04 17:34:49 +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 c51ea47996 Change string buffer handling in json scanner 2014-12-03 20:47:52 +00:00
Jakub Zelenka 098097d83f Fix compilation for json scanner 2014-11-30 18:29:48 +00:00
Jakub Zelenka d07bf91328 Initial import of jsond 2014-11-13 20:20:46 +00:00