delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'PHP-5.6'	Xinchen Hui	2014-01-03	2	-2/+2
\|\
\| *	Bump year	Xinchen Hui	2014-01-03	2	-2/+2
* \|	Merge branch 'PHP-5.6'	kovacs.ferenc	2013-11-18	2	-3/+72
\|\ \ \| \|/
\| *	Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...	Andrea Faulds	2013-11-11	2	-3/+72
* \|	Merge branch 'PHP-5.6'	Adam Harvey	2013-11-10	2	-8/+139
\|\ \ \| \|/
\| *	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2013-11-10	2	-8/+139
\| \|\
\| \| *	Better test: Check combined leading/trailing	Andrea Faulds	2013-10-15	1	-0/+66
\| \| *	Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...	Andrea Faulds	2013-09-17	2	-8/+73
\| \| *	Happy New Year	Xinchen Hui	2013-01-01	2	-2/+2
* \| \|	Make all code paths in json_determine_array_type() return constants.	Adam Harvey	2013-11-09	1	-2/+2
\|/ /
* \|	HASH_KEY_NON_EXISTANT fix	Veres Lajos	2013-07-21	1	-2/+2
* \|	Happy New Year	Xinchen Hui	2013-01-01	2	-2/+2
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2012-12-11	2	-3/+60
\|\ \ \| \|/
\| *	Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.	Adam Harvey	2012-12-11	2	-3/+60
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2012-11-26	1	-17/+22
\|\ \ \| \|/
\| *	Related bug #63588 fix length computation + optimize for speed	Remi Collet	2012-11-26	1	-17/+22
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2012-11-25	5	-67/+31
\|\ \ \| \|/
\| *	Fixed bug #63588 Duplicate implementation of php_next_utf8_char	Remi Collet	2012-11-25	5	-67/+31
\| *	Revert JSON merges to 5.4	Nikita Popov	2012-07-01	16	-232/+47
* \|	Fix 64bit JSON test	Nikita Popov	2012-08-13	1	-2/+2
* \|	Fix test failed due to new feature introduced in 45d596ea	Xinchen Hui	2012-07-29	2	-4/+2
* \|	Add optional depth parameter to json_encode #62369	Florian Anderiasch	2012-07-24	3	-1/+44
\|/
*	fix bug #61359: json_encode() calls too many reallocs	Stanislav Malyshev	2012-06-30	1	-9/+12
*	Merge branch 'PHP-5.3' into PHP-5.4	Nikita Popov	2012-06-28	8	-42/+51
\|\
\| *	Add json_last_error_msg() function	Nikita Popov	2012-06-28	8	-42/+51
* \|	Merge branch 'PHP-5.3' into PHP-5.4	Nikita Popov	2012-06-27	11	-58/+113
\|\ \ \| \|/
\| *	Improve JSON error handling	Nikita Popov	2012-06-27	8	-49/+92
* \|	Merge branch 'PHP-5.3' into PHP-5.4	Nikita Popov	2012-06-23	14	-26/+147
\|\ \ \| \|/
\| *	Improve json_encode error handling	Nikita Popov	2012-06-23	9	-13/+110
\| *	Fix bug #61537 (json_encode() incorrectly truncates/discards information) and	Adam Harvey	2012-04-11	5	-25/+45
* \|	Revert "Update test to fix breakage caused by the previous commit."	Stanislav Malyshev	2012-05-15	1	-7/+3
* \|	- Fixed bug #61978 (Object recursion not detected for classes that implement ...	Felipe Pena	2012-05-08	2	-0/+60
* \|	Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards informat...	Stanislav Malyshev	2012-05-01	5	-45/+25
* \|	Update test to fix breakage caused by the previous commit.	Adam Harvey	2012-04-11	1	-3/+7
* \|	Fix bug #61537 (json_encode() incorrectly truncates/discards information) and	Adam Harvey	2012-04-11	5	-25/+45
* \|	Merge branch 'PHP-5.3' into PHP-5.4	David Soria Parra	2012-03-20	1	-1/+2
\|\ \ \| \|/
\| *	Adding Braces in json.c to conform with coding standards	Matt Nowack	2012-03-20	1	-1/+2
\| *	- Year++	Felipe Pena	2012-01-01	2	-2/+2
\| *	Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with...	Ilia Alshanetsky	2011-10-17	2	-1/+14
\| *	- Make usage of new PHP_FE_END macro	Felipe Pena	2011-07-25	1	-1/+1
\| *	Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber)	Christopher Jones	2011-06-17	1	-25/+0
\| *	Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).	Ilia Alshanetsky	2011-06-01	2	-0/+52
\| *	Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all cases	Scott MacVicar	2011-02-21	2	-1/+37
\| *	Fix Bug #53963, error code isn't always set in certain error cases.	Scott MacVicar	2011-02-09	1	-0/+2
\| *	- Year++	Felipe Pena	2011-01-01	2	-2/+2
\| *	Fix English in the error message emitted when json_decode() is called with	Adam Harvey	2010-09-14	1	-1/+1
\| *	Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they fa...	Scott MacVicar	2010-07-06	1	-0/+1
\| *	Added support for JSON_NUMERIC_CHECK option in json_encode() that converts	Ilia Alshanetsky	2010-05-20	3	-13/+39
\| *	- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)	Felipe Pena	2010-04-18	1	-0/+1
\| *	- Fixed tests	Felipe Pena	2010-04-03	2	-8/+2