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.0	Anatol Belski	2016-05-25	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.6: prepare for 5.6.22RC1
\| * \|	Merge branch 'PHP-5.6.22' into PHP-5.6	Stanislav Malyshev	2016-05-24	8	-151/+216
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6.22: Fix memory leak in imagescale() Update NEWS Better fix for bug #72135 Fixed bug #72227: imagescale out-of-bounds read Fix bug #72241: get_icu_value_internal out-of-bounds read Fix bug #72135 - don't create strings with lengths outside int range prepare for 5.6.22RC1 Add check for string overflow to all string add operations Fix bug #72114 - int/size_t confusion in fread Updated NEWS Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Conflicts: configure.in main/php_version.h
\| \| * \	Merge branch 'PHP-5.5' into PHP-5.6.22	Stanislav Malyshev	2016-05-24	8	-151/+216
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix memory leak in imagescale() Update NEWS Better fix for bug #72135 Fixed bug #72227: imagescale out-of-bounds read Fix bug #72241: get_icu_value_internal out-of-bounds read Fix bug #72135 - don't create strings with lengths outside int range Add check for string overflow to all string add operations Fix bug #72114 - int/size_t confusion in fread Updated NEWS Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Conflicts: Zend/zend_operators.c ext/phar/dirstream.c ext/phar/tests/bug71331.phpt
\| \| * \|	prepare for 5.6.22RC1php-5.6.22RC1	Ferenc Kovacs	2016-05-11	3	-6/+4
\| \| \| \|
* \| \| \|	Merge branch 'PHP-7.0.7' into PHP-7.0	Stanislav Malyshev	2016-05-24	4	-4/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0.7: Fix memory leak in imagescale() Update NEWS Better fix for bug #72135 Fixed bug #72227: imagescale out-of-bounds read Fix bug #72241: get_icu_value_internal out-of-bounds read Fix bug #72135 - don't create strings with lengths outside int range set versions Add check for string overflow to all string add operations Fix bug #72114 - int/size_t confusion in fread Updated NEWS Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Conflicts: configure.in main/php_version.h
\| * \ \ \	Merge branch 'PHP-5.5' into PHP-7.0.7	Stanislav Malyshev	2016-05-24	4	-4/+34
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fix memory leak in imagescale() Update NEWS Better fix for bug #72135 Fixed bug #72227: imagescale out-of-bounds read Fix bug #72241: get_icu_value_internal out-of-bounds read Fix bug #72135 - don't create strings with lengths outside int range Add check for string overflow to all string add operations Fix bug #72114 - int/size_t confusion in fread Updated NEWS Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Conflicts: Zend/zend_operators.c ext/intl/locale/locale_methods.c ext/phar/dirstream.c ext/phar/tests/bug71331.phpt ext/standard/file.c ext/standard/html.c
\| \| * \| \|	Fix memory leak in imagescale()	Stanislav Malyshev	2016-05-24	2	-4/+4
\| \| \| \| \|
\| \| * \| \|	Update NEWS	Stanislav Malyshev	2016-05-24	1	-2/+12
\| \| \| \| \|
\| \| * \| \|	Better fix for bug #72135	Stanislav Malyshev	2016-05-24	1	-4/+5
\| \| \| \| \|
\| \| * \| \|	Fixed bug #72227: imagescale out-of-bounds read	Stanislav Malyshev	2016-05-23	2	-8/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ported from https://github.com/libgd/libgd/commit/4f65a3e4eedaffa1efcf9ee1eb08f0b504fbc31a
\| \| * \| \|	Fix bug #72241: get_icu_value_internal out-of-bounds read	Stanislav Malyshev	2016-05-22	2	-117/+132
\| \| \| \| \|
\| \| * \| \|	Fix bug #72135 - don't create strings with lengths outside int range	Stanislav Malyshev	2016-05-15	1	-23/+27
\| \| \| \| \|
\| \| * \| \|	Add check for string overflow to all string add operations	Stanislav Malyshev	2016-05-09	1	-0/+7
\| \| \| \| \|
\| \| * \| \|	Fix bug #72114 - int/size_t confusion in fread	Stanislav Malyshev	2016-05-09	2	-0/+18
\| \| \| \| \|
\| \| * \| \|	Updated NEWS	Julien Pauli	2016-05-02	1	-5/+8
\| \| \| \| \|
\| \| * \| \|	Backport of fixed for bug #71331 - Uninitialized pointer in ↵	Julien Pauli	2016-05-02	4	-2/+18
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	phar_make_dirstream()
\| \| \| * \| \|	Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()	Stanislav Malyshev	2016-04-28	4	-2/+18
\| \| \| \| \| \|
\| * \| \| \| \|	set versionsphp-7.0.7RC1	Anatol Belski	2016-05-10	3	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Derick Rethans	2016-05-18	4	-32/+81
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Fixed bug #63740 (strtotime seems to use both sunday and monday as start of ↵	Derick Rethans	2016-05-18	5	-32/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	week)
* \| \| \| \| \|	Use PHP_VERSION as OPcahce version	Dmitry Stogov	2016-05-17	3	-5/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Let's only read-only here	Xinchen Hui	2016-05-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed bug #72229 (Wrong reference when serialize/unserialize an object)	Xinchen Hui	2016-05-17	3	-0/+59
\| \| \| \| \| \|
* \| \| \| \| \|	update NEWS	Anatol Belski	2016-05-16	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Tidy up	Thomas Punt	2016-05-16	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Remove unnecessary boundary checks	Thomas Punt	2016-05-16	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve bug #72017	Thomas Punt	2016-05-16	2	-6/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "Revert the ABI break commit"	Xinchen Hui	2016-05-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 07220f615b432837e158820fa08206fcc78c93e2.
* \| \| \| \| \|	Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on ↵	Xinchen Hui	2016-05-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zend_string_allocs)"" obviously I read the change is in argument lists by mistake :< This reverts commit 9e7afa75140afd047cb95280a610cff9368a7517.
* \| \| \| \| \|	Correct name, it was typed in habitually	Xinchen Hui	2016-05-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Revert the ABI break commit	Xinchen Hui	2016-05-16	1	-3/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "fix #72143 (preg_replace uses int instead of size_t on ↵	Xinchen Hui	2016-05-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zend_string_allocs)" ABI break This reverts commit fb951553be0175712f4b757e05004110d7421e04.
* \| \| \| \| \|	Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)	Xinchen Hui	2016-05-16	2	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)	Joe Watkins	2016-05-14	2	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	fix #72206 (xml_parser_create/xml_parser_free leaks mem)	Joe Watkins	2016-05-14	2	-3/+6
\| \| \| \| \| \|
* \| \| \| \| \|	improve 7132fe19c29c512d00a3afe101212ba15fa1f99e	Joe Watkins	2016-05-13	1	-13/+6
\| \| \| \| \| \|
* \| \| \| \| \|	fix 1bb8a7b0b895af4a9e6b24101fe8fab5af64f86c	Joe Watkins	2016-05-13	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)	Joe Watkins	2016-05-13	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	fix dir separator in test	Anatol Belski	2016-05-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	update NEWS	Anatol Belski	2016-05-12	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	workaround the extra new line in the test out on another env	Anatol Belski	2016-05-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed bug #72197 pg_lo_create arbitrary read	Anatol Belski	2016-05-12	2	-1/+38
\| \| \| \| \| \|
* \| \| \| \| \|	Added NEWS entry missed while doing merge	Xinchen Hui	2016-05-12	1	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Committed by accident	Xinchen Hui	2016-05-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0	Xinchen Hui	2016-05-12	2	-1/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-7.0' of git.php.net:/php-src: Fix serializing ZEND_AST_SHELL_EXEC add missing NEWS entry prepare for 5.6.22RC1 add missing NEWS entry
\| * \| \| \| \| \|	Fix serializing ZEND_AST_SHELL_EXEC	Sara Golemon	2016-05-12	2	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, `foo` is reserialized as `'foo'` due to misuse of zend_ast_export(). ZEND_AST_SHELL_EXEC can only contain ZEND_AST_ZVAL(string) or ZEND_AST_ENCAPS_LIST, so just handle the ZEND_AST_ZVAL(string) case directly.
\| * \| \| \| \| \|	add missing NEWS entry	Ferenc Kovacs	2016-05-11	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Ferenc Kovacs	2016-05-11	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: prepare for 5.6.22RC1 add missing NEWS entry
\| \| * \| \| \| \|	prepare for 5.6.22RC1	Ferenc Kovacs	2016-05-11	2	-4/+4
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	add missing NEWS entry	Ferenc Kovacs	2016-05-11	1	-2/+7
\| \| \| \| \| \|