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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	Merge branch 'master' into jsond	Jakub Zelenka	2015-01-25	1	-1/+9
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ext/json/JSON_parser.c ext/json/json.c
\| * \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2015-01-19	1	-8/+29
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fixed bug #50224 where float without decimals were converted to integer Updated NEWS for #68371
\| \| * \|	Fixed bug #50224 where float without decimals were converted to integer	Juan Basso	2015-01-19	1	-8/+29
\| \| \| \|
\| \| * \|	bump year	Xinchen Hui	2015-01-15	1	-1/+1
\| \| \| \|
\| * \| \|	bump year	Xinchen Hui	2015-01-15	1	-1/+1
\| \| \| \|
\| * \| \|	trailing whitespace removal	Stanislav Malyshev	2015-01-10	1	-2/+2
\| \| \| \|
* \| \| \|	Porting implementation of RFC json_preserve_fractional_part	Juan Basso	2015-01-12	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into jsond	Jakub Zelenka	2014-12-27	1	-10/+15
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	first shot remove TSRMLS_* things	Anatol Belski	2014-12-13	1	-39/+39
\| \| \| \|
\| * \| \|	ext/iconv, ext/json and ext/session use static tsrmls pointer	Anatol Belski	2014-10-17	1	-0/+6
\| \| \| \|
* \| \| \|	Fix compilation for json_encoder	Jakub Zelenka	2014-11-30	1	-2/+0
\| \| \| \|
* \| \| \|	Add missing bits to php_json.h	Jakub Zelenka	2014-11-25	1	-2/+2
\| \| \| \|
* \| \| \|	Move json encoding stuff	Jakub Zelenka	2014-11-24	1	-585/+8
\|/ / /
* \| \|	Fix ::jsonSerialize() failure message	Nikita Popov	2014-10-12	1	-1/+1
\| \| \|
* \| \|	Move smart_str implementation into Zend/	Nikita Popov	2014-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* \| \|	Use inline functions for most of smart_str	Nikita Popov	2014-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope, instead it returns the new length.
* \| \|	s/PHP 5/PHP 7/	Johannes Schlüter	2014-09-19	1	-1/+1
\| \| \|
* \| \|	Fixed useless or duplicated IS_INTERNED() checks	Dmitry Stogov	2014-09-19	1	-1/+1
\| \| \|
* \| \|	fix signature	Anatol Belski	2014-08-27	1	-1/+1
\| \| \|
* \| \|	's' works with size_t round 3	Anatol Belski	2014-08-27	1	-1/+1
\| \| \|
* \| \|	first show to make 's' work with size_t	Anatol Belski	2014-08-27	1	-2/+2
\| \| \|
* \| \|	Improved performance of json_encode()	Dmitry Stogov	2014-08-27	1	-29/+42
\| \| \|
* \| \|	master renames phase 1	Anatol Belski	2014-08-25	1	-43/+43
\| \| \|
* \| \|	ported ext/json	Anatol Belski	2014-08-19	1	-12/+12
\| \| \|
* \| \|	basic macro replacements, all at once	Anatol Belski	2014-08-19	1	-32/+32
\| \| \|
* \| \|	Merge branch 'PHP-5.6'	Lior Kaplan	2014-08-17	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: typofixes Conflicts: ext/spl/php_spl.c
\| * \|	Merge branch 'PHP-5.5' into PHP-5.6	Lior Kaplan	2014-08-17	1	-1/+1
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	* PHP-5.5: typofixes
\| \| *	Merge branch 'PHP-5.4' into PHP-5.5	Lior Kaplan	2014-08-17	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: typofixes
\| \| \| *	typofixes	Veres Lajos	2014-08-17	1	-1/+1
\| \| \| \|
* \| \| \|	Use reference counting instead of zval duplication	Dmitry Stogov	2014-06-05	1	-1/+1
\| \| \| \|
* \| \| \|	Introduced immutable arrays. They don't need to be copyed and may be used ↵	Dmitry Stogov	2014-05-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	directly from SHM.
* \| \| \|	Fixed Reference handling in xml_parse_into_struct	Xinchen Hui	2014-05-05	1	-3/+0
\| \| \| \|
* \| \| \|	Port JSON	Nikita Popov	2014-05-05	1	-114/+97
\| \| \| \|
* \| \| \|	Merge branch 'PHP-5.6'	Stanislav Malyshev	2014-04-13	1	-8/+10
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix #66021 (Blank line inside empty array/object)
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-04-13	1	-8/+10
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix #66021 (Blank line inside empty array/object)
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-04-13	1	-8/+10
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix #66021 (Blank line inside empty array/object)
\| \| \| *	Merge branch 'pull-request/518' into PHP-5.4	Stanislav Malyshev	2014-04-13	1	-8/+10
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/518: Fix #66021 (Blank line inside empty array/object)
\| \| \| \| *	Fix #66021 (Blank line inside empty array/object)	Kevin Israel	2013-11-02	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified, the pair of linefeeds immediately after an opening bracket and before the corresponding closing bracket is omitted when the array or object contains no elements or accessible properties (and hence would have a blank line between the brackets).
\| \| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Julien Pauli	2014-02-17	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Export JsonSerializable Interface (bug #65753)
\| \| \| * \|	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
\| \| \| \| \|
* \| \| \| \|	Export JsonSerializable Interface (bug #65753)	Julien Pauli	2014-02-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-5.6'	Xinchen Hui	2014-01-03	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Bump year	Xinchen Hui	2014-01-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-5.6'	kovacs.ferenc	2013-11-18	1	-3/+3
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fixed case part of bug #64874 ("json_decode handles whitespace and ↵	Andrea Faulds	2013-11-11	1	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	case-sensitivity incorrectly")
* \| \| \|	Merge branch 'PHP-5.6'	Adam Harvey	2013-11-10	1	-8/+22
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Update NEWS and remove the unnecessary UPGRADING note. UPGRADING and NEWS Better test: Check combined leading/trailing Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
\| * \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Adam Harvey	2013-11-10	1	-8/+22
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Update NEWS and remove the unnecessary UPGRADING note. UPGRADING and NEWS Better test: Check combined leading/trailing Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")