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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'PHP-5.5' into PHP-5.6	Lior Kaplan	2014-08-17	1	-1/+1
\|\
\| *	Merge branch 'PHP-5.4' into PHP-5.5	Lior Kaplan	2014-08-17	1	-1/+1
\| \|\
\| \| *	typofixes	Veres Lajos	2014-08-17	1	-1/+1
* \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-04-13	1	-8/+10
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-04-13	1	-8/+10
\| \|\ \ \| \| \|/
\| \| *	Merge branch 'pull-request/518' into PHP-5.4	Stanislav Malyshev	2014-04-13	1	-8/+10
\| \| \|\
\| \| \| *	Fix #66021 (Blank line inside empty array/object)	Kevin Israel	2013-11-02	1	-8/+10
\| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Julien Pauli	2014-02-17	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Export JsonSerializable Interface (bug #65753)	Julien Pauli	2014-02-17	1	-1/+1
\| \| * \|	Bump year	Xinchen Hui	2014-01-03	1	-1/+1
\| * \| \|	Bump year	Xinchen Hui	2014-01-03	1	-1/+1
* \| \| \|	Export JsonSerializable Interface (bug #65753)	Julien Pauli	2014-02-17	1	-1/+1
* \| \| \|	Bump year	Xinchen Hui	2014-01-03	1	-1/+1
* \| \| \|	Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...	Andrea Faulds	2013-11-11	1	-3/+3
\|/ / /
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2013-11-10	1	-8/+22
\|\ \ \ \| \|/ /
\| * \|	Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...	Andrea Faulds	2013-09-17	1	-8/+22
\| \|/
\| *	Happy New Year	Xinchen Hui	2013-01-01	1	-1/+1
* \|	HASH_KEY_NON_EXISTANT fix	Veres Lajos	2013-07-21	1	-2/+2
* \|	Happy New Year	Xinchen Hui	2013-01-01	1	-1/+1
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2012-12-11	1	-3/+28
\|\ \ \| \|/
\| *	Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.	Adam Harvey	2012-12-11	1	-3/+28
* \|	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	1	-3/+29
\|\ \ \| \|/
\| *	Fixed bug #63588 Duplicate implementation of php_next_utf8_char	Remi Collet	2012-11-25	1	-3/+29
\| *	Revert JSON merges to 5.4	Nikita Popov	2012-07-01	1	-54/+10
* \|	Fix test failed due to new feature introduced in 45d596ea	Xinchen Hui	2012-07-29	1	-1/+1
* \|	Add optional depth parameter to json_encode #62369	Florian Anderiasch	2012-07-24	1	-1/+9
\|/
*	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	1	-10/+19
\|\
\| *	Add json_last_error_msg() function	Nikita Popov	2012-06-28	1	-10/+19
* \|	Merge branch 'PHP-5.3' into PHP-5.4	Nikita Popov	2012-06-27	1	-9/+33
\|\ \ \| \|/
\| *	Improve JSON error handling	Nikita Popov	2012-06-27	1	-8/+33
* \|	Merge branch 'PHP-5.3' into PHP-5.4	Nikita Popov	2012-06-23	1	-7/+18
\|\ \ \| \|/
\| *	Improve json_encode error handling	Nikita Popov	2012-06-23	1	-4/+11
\| *	Fix bug #61537 (json_encode() incorrectly truncates/discards information) and	Adam Harvey	2012-04-11	1	-4/+7
* \|	- Fixed bug #61978 (Object recursion not detected for classes that implement ...	Felipe Pena	2012-05-08	1	-0/+13
* \|	Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards informat...	Stanislav Malyshev	2012-05-01	1	-7/+4
* \|	Fix bug #61537 (json_encode() incorrectly truncates/discards information) and	Adam Harvey	2012-04-11	1	-4/+7
* \|	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	1	-1/+1
\| *	Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with...	Ilia Alshanetsky	2011-10-17	1	-1/+1
\| *	- Make usage of new PHP_FE_END macro	Felipe Pena	2011-07-25	1	-1/+1
\| *	Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).	Ilia Alshanetsky	2011-06-01	1	-0/+2
\| *	Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all cases	Scott MacVicar	2011-02-21	1	-1/+2
\| *	- Year++	Felipe Pena	2011-01-01	1	-1/+1
\| *	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	1	-11/+27