12 Commits

Author	SHA1	Message	Date
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	e18dd67975	Move json encoding stuff	2014-11-24 20:46:13 +00:00
Jakub Zelenka	d07bf91328	Initial import of jsond	2014-11-13 20:20:46 +00:00
Anatol Belski	7a6a3d923b	fix arg order, CFLAGS is the fifth arg in m4	2014-10-17 16:03:40 +02:00
Anatol Belski	fea10f6a5e	ext/iconv, ext/json and ext/session use static tsrmls pointer	2014-10-17 14:16:40 +02:00
Remi Collet	289bb339c9	Fixed bug #63588 Duplicate implementation of php_next_utf8_char ... Json use an utf8 parser from a third party library, switch to our implementation of php_next_utf8_char. This also helps on solving #63520. All the unit tests succeed. Our implementation also seems a little faster. json.dsp need to be regenerated.	2012-11-25 08:14:23 +01:00
Johannes Schlüter	96d5c5e931	The json header should be installed so other exts can use it	2009-06-23 13:09:34 +00:00
foobar	7ed3c4536d	MFH: Fix some configure --help texts	2007-07-03 17:25:43 +00:00
Antony Dovgal	f59a139f61	rephrase	2006-07-20 10:47:37 +00:00
foobar	68ae270793	MFH: simplify	2006-07-20 10:11:15 +00:00
Ilia Alshanetsky	cdfe00b801	Fixed compiler warnings and enable Json by default.	2006-07-19 16:17:15 +00:00
SVN Migration	608baa409a	This commit was manufactured by cvs2svn to create branch 'PHP_5_2'.	2006-05-05 15:49:42 +00:00