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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'PHP-5.6' into PHP-7.0php-7.0.9 PHP-7.0.9	Xinchen Hui	2016-07-20	1	-1/+2
\| \| \| \| \| \| \|	* PHP-5.6: Fixed arginfo (cherry picked from commit e4af29b0b7633cad56a46bbffafae079a0cd882c)
*	regenerate date parser with re2c 0.13.5	Anatol Belski	2016-07-20	1	-14989/+17877
\| \| \| \|	(cherry picked from commit 90c26fb6b102d68a90a519eacec095265d6ba100)
*	Merge branch 'PHP-5.6' into PHP-7.0	Derick Rethans	2016-07-20	1	-27723/+14187
\| \| \| \|	(cherry picked from commit 1dafa806a940a3c4e09a9a837b33839e54600eee)
*	Merge branch 'PHP-5.6' into PHP-7.0	Derick Rethans	2016-07-20	1	-21149/+30240
\| \| \| \|	(cherry picked from commit 7759d6b0db0437195442ea2d43e1a49001ef23a7)
*	update UPGRADING	Anatol Belski	2016-07-19	1	-0/+4
\|
*	set versions	Anatol Belski	2016-07-19	2	-3/+3
\|
*	update NEWS	Anatol Belski	2016-07-19	1	-1/+46
\|
*	#72482, Ilegal write/read access caused by gdImageAALine overflow	Pierre Joye	2016-07-19	1	-47/+2
\| \| \| \|	(cherry picked from commit b25009fc2c97c6b5a93b3fc5f6a5b221b62f1273)
*	fix #72494, improve input color check and prevent issues when old gd are ↵	Pierre Joye	2016-07-19	1	-1/+1
\| \| \| \| \| \|	used, done before gd call (cherry picked from commit 1d69028d2f15216d128b5a6e606f763ef09d4991)
*	fix test portability and expectation	Anatol Belski	2016-07-19	3	-5/+5
\| \| \| \| \| \| \| \|	The test images for #72603 and #72618 are broken, that seems to be the cause of different test output. Seems also to be platform dependent, so it's not reliable to depend on the exact error output. (cherry picked from commit bd1919504b19ada4f801d2fe939e79a07006c52a)
*	Fix for bug #72513	Stanislav Malyshev	2016-07-19	1	-1/+1
\| \| \| \| \| \|	This is applicable to 7 as well, but was somehow missing from the merge. (cherry picked from commit 374ae8e9da58464e22f3e5a461ee95f6240979e7)
*	improve fix #72558, free contribRow as well	Pierre Joye	2016-07-19	1	-0/+1
\| \| \| \|	(cherry picked from commit 48e76abadd17a090259db77f3294d870fbc31ba5)
*	improve fix #72558, while (u>=0) with unsigned int will always be true	Pierre Joye	2016-07-19	1	-3/+4
\| \| \| \|	(cherry picked from commit df0951508920d3e8400c99d058fa213397b752f8)
*	Fix memory leak	Stanislav Malyshev	2016-07-19	1	-0/+1
\| \| \| \|	(cherry picked from commit 47d6ea6332d457f16ab4b33f42fdb62e66acb73f)
*	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-07-19	23	-81/+358
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. 5.6.24RC1 add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: Zend/zend_virtual_cwd.c ext/bz2/bz2.c ext/exif/exif.c ext/session/session.c ext/snmp/snmp.c ext/standard/basic_functions.c main/SAPI.c main/php_variables.c (cherry picked from commit b00f8f2a5bae651d6375ca34c676963f1f25ee5a)
*	Partial fix for bug #72613 - do not allow reading past error read	Stanislav Malyshev	2016-07-19	3	-1/+28
\| \| \| \|	(cherry picked from commit 5faa15c4ce9d68a286a9ffe10ecbb897ebe95601)
*	fix #72512, invalid read or write for palette image when invalid transparent ↵	Pierre Joye	2016-07-19	3	-6/+32
\| \| \| \| \| \|	index is used (cherry picked from commit 0fbcff1b35c1005b8d2cdfd33184867912d9d83a)
*	Fix bug #72551 and bug #72552 - check before converting size_t->int	Stanislav Malyshev	2016-07-19	1	-0/+8
\| \| \| \|	(cherry picked from commit 3810e7b362e7bdef00ad33ae683a49aa7ab19e0d)
*	Fix bug #72541 - size_t overflow lead to heap corruption	Stanislav Malyshev	2016-07-19	1	-0/+4
\| \| \| \|	(cherry picked from commit 2ca8d85dd4ac6d5f8c046f339f9636e3099b0f08)
*	fix #72519, possible OOB using imagegif	Pierre Joye	2016-07-19	1	-2/+16
\| \| \| \|	(cherry picked from commit 2fbce5f51f4ba01e4d0de3b8592bb14773a98d4d)
*	update NEWS	Anatol Belski	2016-07-14	1	-0/+4
\|
*	Fixed bug #72570 Segmentation fault when binding parameters on a query ↵	Matteo Beccati	2016-07-14	2	-0/+31
\| \| \| \| \| \|	without placeholders Special commit for 7.0.9
*	fix possible optimization bugphp-7.0.9RC1	Anatol Belski	2016-07-05	1	-1/+1
\|
*	set versions	Anatol Belski	2016-07-05	3	-4/+4
\|
*	add missing NEWS entry	Anatol Belski	2016-07-04	1	-0/+4
\|
*	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-07-04	1	-1/+1
\|\
\| *	Fix typo in comment	Christoph M. Becker	2016-07-04	1	-1/+1
\| \|
* \|	Merge branch 'PHP-5.6' into PHP-7.0	Ferenc Kovacs	2016-07-03	0	-0/+0
\|\ \ \| \|/
\| *	this was actually fixed in 5.6.23	Ferenc Kovacs	2016-07-03	1	-2/+4
\| \|
* \|	Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0	Xinchen Hui	2016-07-03	2	-1/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-7.0' of git.php.net:/php-src: update NEWS extend test Fixed bug #72534 stream_socket_get_name crashes
\| * \|	update NEWS	Anatol Belski	2016-07-03	1	-0/+1
\| \| \|
\| * \|	extend test	Anatol Belski	2016-07-03	1	-1/+4
\| \| \|
\| * \|	Fixed bug #72534 stream_socket_get_name crashes	Anatol Belski	2016-07-03	2	-1/+17
\| \| \|
* \| \|	Fixed bug #72538 (readline_redisplay crashes php)	Xinchen Hui	2016-07-03	3	-0/+23
\|/ /
* \|	Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)	Xinchen Hui	2016-07-03	2	-0/+8
\| \|
* \|	update NEWS	Anatol Belski	2016-07-01	1	-0/+3
\| \|
* \|	Fixed bug #72498 variant_date_from_timestamp null dereference	Anatol Belski	2016-07-01	2	-0/+23
\| \|
* \|	Don't use FUNC_ARG fetches for call_user_func()	Nikita Popov	2016-06-28	2	-12/+20
\| \| \| \| \| \| \| \|	This makes no sense -- SEND_USER can't even handle INDIRECTs.
* \|	Make call_user_func() on reference args consistent	Nikita Popov	2016-06-28	3	-71/+84
\| \| \| \| \| \| \| \| \| \| \| \|	Previously reference arguments were allowed if call_user_func() was compiled to SEND_USER and not otherwise. Make it consistent by always forbidding them.
* \|	Fixed test	Xinchen Hui	2016-06-28	1	-2/+0
\| \|
* \|	Fixed bug #72508 (strange references after recursive function call and ↵	Xinchen Hui	2016-06-28	3	-2/+52
\| \| \| \| \| \| \| \|	"switch" statement)
* \|	MFH: Fixed fd leak (the origin commit can not be cherry-picked)	Xinchen Hui	2016-06-28	4	-3/+10
\| \|
* \|	Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0	Xinchen Hui	2016-06-28	2	-0/+61
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-7.0' of git.php.net:/php-src: Fix the fix for #72403 on nl2br Update NEWS Update NEWS Fix #70628: Clearing bindings on an SQLite3 statement doesn't work 5.5.38 now
\| * \	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-06-27	0	-0/+0
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix the fix for #72403 on nl2br 5.5.38 now Conflicts: ext/standard/string.c
\| \| *	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2016-06-27	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix the fix for #72403 on nl2br 5.5.38 now Conflicts: configure.in main/php_version.h
\| \| \| *	Fix the fix for #72403 on nl2br	Stanislav Malyshev	2016-06-27	1	-1/+1
\| \| \| \|
\| \| \| *	5.5.38 now	Julien Pauli	2016-06-21	3	-5/+9
\| \| \| \|
\| * \| \|	Update NEWS	Christoph M. Becker	2016-06-27	1	-0/+4
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-06-27	2	-0/+61
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Update NEWS	Christoph M. Becker	2016-06-27	1	-0/+4
\| \| \| \|