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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update versions/dates for PHP 7.1.0PHP-7.1.0	Davey Shafik	2016-12-02	3	-4/+4
\|
*	Update NEWS for release	Davey Shafik	2016-12-01	1	-597/+2309
\| \| \| \| \|	- Merge all 7.1 builds into 7.1.0 - Add previous release NEWS
*	Update NEWS for the build	Davey Shafik	2016-11-30	1	-1/+1
\|
*	Merge branch 'PHP-7.0' into PHP-7.1	Dmitry Stogov	2016-11-28	4	-1/+60
\|\ \| \| \| \| \| \| \| \|	* PHP-7.0: Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
\| *	Fixed bug #73586 (php_user_filter::$stream is not set to the stream the ↵	Dmitry Stogov	2016-11-28	4	-1/+60
\| \| \| \| \| \| \| \|	filter is working on).
* \|	Merge branch 'PHP-7.0' into PHP-7.1	Dmitry Stogov	2016-11-28	3	-6/+24
\|\ \ \| \|/ \| \| \| \| \| \|	* PHP-7.0: Fixed calling generators through magic __call()
\| *	Fixed calling generators through magic __call()	Dmitry Stogov	2016-11-28	3	-20/+64
\| \|
* \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-27	2	-50/+56
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	* PHP-7.0: add NEWS Fix #68447: grapheme_extract take an extra trailing character
\| *	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-11-27	0	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: add NEWS
\| \| *	add NEWS	Stanislav Malyshev	2016-11-27	1	-0/+4
\| \| \|
\| * \|	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-11-27	2	-50/+56
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix #68447: grapheme_extract take an extra trailing character
\| \| *	Merge branch 'pull-request/1974' into PHP-5.6	Stanislav Malyshev	2016-11-27	2	-53/+60
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/1974: Fix #68447: grapheme_extract take an extra trailing character
\| \| \| *	Fix #68447: grapheme_extract take an extra trailing character	SATO Kentaro	2016-07-01	2	-49/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	grapheme_extract() converts UTF-8 string in the argument to UTF-16 to iterate through graphemes, and count each UTF-16 character as one Unicode character, which is not correct for UTF-16 surrogate pairs. The patch removes the conversion and counts UTF-8 directly if needed.
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-27	2	-1/+39
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fix #73549: Use after free when stream is passed to imagepng
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-11-27	2	-1/+39
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix #73549: Use after free when stream is passed to imagepng
\| \| * \|	Fix #73549: Use after free when stream is passed to imagepng	Christoph M. Becker	2016-11-27	3	-1/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a stream is passed to imagepng() or other image output functions, opposed to a filename, we must not close this stream.
* \| \| \|	Update UPGRADING with info about AEAD changes in openssl_(en\|de)crypt	Jakub Zelenka	2016-11-27	1	-0/+2
\| \| \| \|
* \| \| \|	Do not add extra timeval entropy when OpenSSL 1.1 used	Jakub Zelenka	2016-11-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is already added by OpenSSL so it is not needed
* \| \| \|	Clean up and fix php_openssl_dh_pub_from_priv	Jakub Zelenka	2016-11-27	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Matteo Beccati	2016-11-27	1	-4/+4
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fix occasionaly failing test
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Matteo Beccati	2016-11-27	1	-4/+4
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix occasionaly failing test
\| \| * \|	Fix occasionaly failing test	Matteo Beccati	2016-11-27	1	-4/+4
\| \| \| \|
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Matteo Beccati	2016-11-27	1	-0/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Added missing array key to $JUNIT
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Matteo Beccati	2016-11-27	1	-0/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Added missing array key to $JUNIT
\| \| * \|	Added missing array key to $JUNIT	Matteo Beccati	2016-11-27	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-26	1	-1/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS. Add more mbfl string size checks (bug #73505)
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-11-26	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS. Add more mbfl string size checks (bug #73505)
\| \| * \|	acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.	Michael Orlitzky	2016-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When building with kerberos support (--with-kerberos), a few libraries and flags need to be added to various parts of the build system. The most reliable way to get those flags is through the krb5-config program that ships with both major implementations of kerberos. The PHP_SETUP_KERBEROS macro in acinclude.m4 attempts to detect krb5-config, and use it. However, there's a bug in that macro. The --with-kerberos parameter accepts a directory where the kerberos libraries can be found. When a directory is given, it is stored in the PHP_KERBEROS variable. The following test, if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then thus fails whenever a directory is passed to --with-kerberos, since it compares a directory name against the string "yes". This causes krb5-config to go unused, and some unreliable fallback logic is attempted instead. One consequence of this is that the Heimdal kerberos implementation cannot be substituted for the MIT one, at least when a directory is passed to --with-kerberos. This commit reverses the logic and checks for "$PHP_KERBEROS" != "no". To confirm that this fixes the issue, one can inspect the "-l" library flags that get appended to the command-line. On a machine with Heimdal and the unmodified acinclude.m4, running ./configure --with-openssl --with-kerberos=/usr will log (for example) to config.log, configure:18082: checking for krb5-config configure:18101: found /usr/bin/krb5-config configure:18114: result: /usr/bin/krb5-config configure:18450: checking for RAND_egd configure:18450: cc ... conftest.c ... -lgssapi_krb5 -lkrb5 ... which are the library names for the MIT implementation. After patching acinclude.m4 to negate the logic, the same command on the same machine outputs (to config.log): configure:18450: cc ... conftest.c -lgssapi -lheimntlm ... These are the correct library names for the Heimdal implementation. PHP-Bug: 73214
\| \| * \|	Add more mbfl string size checks (bug #73505)	Stanislav Malyshev	2016-11-26	3	-3/+33
\| \| \| \|
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-26	2	-2/+28
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Add more mbfl string size checks (bug #73505)
\| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-11-26	2	-2/+28
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Add more mbfl string size checks (bug #73505)
\| \| * \| \|	Add more mbfl string size checks (bug #73505)	Stanislav Malyshev	2016-11-26	3	-3/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Christoph M. Becker	2016-11-26	3	-5/+33
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix #73612: preg_*() may leak memory	Christoph M. Becker	2016-11-26	3	-5/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have to make sure that collectible zvals end up in the GC root buffer, to avoid memory leaks.
* \| \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-25	0	-0/+0
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fix more size_t/int implicit conversions Fix int/size_t confusion in isValidPharFilename (bug #73580)
\| * \| \| \|	Fix more size_t/int implicit conversions	Stanislav Malyshev	2016-11-25	1	-66/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the conversions are explicit and do checks. Not sure it's the best way but at least we can see them now in the open.
\| * \| \| \|	Fix int/size_t confusion in isValidPharFilename (bug #73580)	Stanislav Malyshev	2016-11-25	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-25	1	-66/+149
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fix more size_t/int implicit conversions
\| * \| \| \| \|	Fix more size_t/int implicit conversions	Stanislav Malyshev	2016-11-25	1	-66/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the conversions are explicit and do checks. Not sure it's the best way but at least we can see them now in the open.
* \| \| \| \| \|	Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1	Stanislav Malyshev	2016-11-25	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-7.1' of git.php.net:php-src: Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
\| * \ \ \ \ \	Merge branch 'PHP-7.0' into PHP-7.1	Christoph M. Becker	2016-11-25	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-11-25	1	-0/+1
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt	Christoph M. Becker	2016-11-25	1	-0/+1
\| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test is not supposed to work with JIS-mapped Japanese font support enabled.
* \| \| \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Stanislav Malyshev	2016-11-25	1	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|	* PHP-7.0: Fix int/size_t confusion in isValidPharFilename (bug #73580)
\| * \| \| \|	Fix int/size_t confusion in isValidPharFilename (bug #73580)	Stanislav Malyshev	2016-11-25	1	-0/+4
\| \|/ / /
* \| \| \|	Merge branch 'PHP-7.0' into PHP-7.1	Anatol Belski	2016-11-24	1	-0/+27
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: add test for bug #57547
\| * \| \|	add test for bug #57547	Anatol Belski	2016-11-24	1	-0/+27
\| \| \| \|
* \| \| \|	Updated to version 2016.10 (2016j)	Derick Rethans	2016-11-24	1	-432/+583
\| \| \| \|
* \| \| \|	Empty merge	Derick Rethans	2016-11-24	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Updated to version 2016.10 (2016j)	Derick Rethans	2016-11-24	1	-432/+583
\| \| \| \|