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

	Commit message (Collapse)	Author	Age	Files	Lines
*	upgraded to PCRE 8.39	Anatol Belski	2016-06-19	61	-4238/+5976
\|
*	Merge branch 'openssl_aead'	Jakub Zelenka	2016-06-19	9	-90/+565
\|\
\| *	Add NEWS entry about OpenSSL AEAD	Jakub Zelenka	2016-06-19	1	-0/+2
\| \|
\| *	Merge branch 'openssl_error_store' into openssl_aead	Jakub Zelenka	2016-06-19	1	-0/+4
\| \|\ \| \|/ \|/\|
* \|	Update NEWS with info about OpenSSL error store	Jakub Zelenka	2016-06-19	1	-0/+4
\| \|
\| *	Merge branch 'openssl_error_store' into openssl_aead	Jakub Zelenka	2016-06-19	1	-17/+0
\| \|\ \| \|/ \|/\|
* \|	Remove test for incorrect fix of bug #69882	Jakub Zelenka	2016-06-19	1	-17/+0
\| \| \| \| \| \| \| \|	The fix just cleared the errors without storing which was wrong
\| *	Merge branch 'openssl_error_store' into openssl_aead	Jakub Zelenka	2016-06-19	932	-29581/+62577
\| \|\ \| \|/ \|/\|
* \|	Remove expected openssl errors that are not needed anymore	Jakub Zelenka	2016-06-19	1	-2/+2
\| \|
* \|	Merge branch 'master' into openssl_error_store	Jakub Zelenka	2016-06-19	796	-44045/+120828
\|\ \
\| * \|	Update NEWS (this bug also exists in 7.1-alpha)	Xinchen Hui	2016-06-18	1	-0/+4
\| \| \|
\| * \|	Merge branch 'PHP-7.0'	Stanislav Malyshev	2016-06-18	0	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Update NEWS
\| \| * \	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-06-18	0	-0/+0
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Update NEWS
\| \| \| * \|	Update NEWS	Stanislav Malyshev	2016-06-18	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Stanislav Malyshev	2016-06-18	1	-0/+15
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fix bug #72447: Type Confusion in php_bz2_filter_create()
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Stanislav Malyshev	2016-06-18	1	-0/+15
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.6: Fix bug #72447: Type Confusion in php_bz2_filter_create() Conflicts: ext/bz2/bz2_filter.c
\| \| \| * \|	Fix bug #72447: Type Confusion in php_bz2_filter_create()	Stanislav Malyshev	2016-06-18	2	-1/+16
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Xinchen Hui	2016-06-18	1	-4/+14
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Update NEWS	Xinchen Hui	2016-06-18	1	-0/+4
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Xinchen Hui	2016-06-18	1	-4/+14
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: main/streams/xp_socket.c
\| \| \| * \|	Fixed bug #72439 (Stream socket with remote address leads to a segmentation ↵	Xinchen Hui	2016-06-18	2	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fault)
\| * \| \| \|	Exception safety for direct CV assign of *CALL instrs	Nikita Popov	2016-06-18	3	-2/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Converting T = CALL; ASSIGN $v, T into $v = CALL may not be safe if an exception is thrown after the return value has been populated -- in this case the value might be destroyed twice.
\| * \| \| \|	typo	Xinchen Hui	2016-06-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed bug #72441 (Segmentation fault: RFC list_keys)	Xinchen Hui	2016-06-17	3	-5/+20
\| \| \| \| \|
\| * \| \| \|	Update NEWS	Christoph M. Becker	2016-06-17	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Christoph M. Becker	2016-06-17	2	-3/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Update NEWS	Christoph M. Becker	2016-06-17	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-06-17	2	-3/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix #53640: XBM images require width to be multiple of 8	Christoph M. Becker	2016-06-17	3	-3/+2
\| \| \| \| \|
\| * \| \| \|	fix SQLite info	Anatol Belski	2016-06-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	update NEWS and UPGRADING	Anatol Belski	2016-06-17	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	update NEWS	Anatol Belski	2016-06-17	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	fix test portability	Anatol Belski	2016-06-17	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	fix test portability	Anatol Belski	2016-06-17	4	-6/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Xinchen Hui	2016-06-17	1	-4/+5
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-7.0: Fixed "implicit declaration of function ‘msgformat_fix_quotes’"
\| \| * \| \|	Fixed "implicit declaration of function ‘msgformat_fix_quotes’"	Xinchen Hui	2016-06-17	1	-4/+5
\| \| \| \| \|
\| * \| \| \|	fix test portability	Anatol Belski	2016-06-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Jakub Zelenka	2016-06-16	2	-6/+6
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Jakub Zelenka	2016-06-16	2	-6/+6
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix incorrect error suppressing in openssl_error_string test	Jakub Zelenka	2016-06-16	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	Fix occasionally failing OpenSSL DH bug test	Jakub Zelenka	2016-06-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The test was failing when first byte was 0
\| * \| \| \|	Merge branch 'master' of http://git.php.net/repository/php-src	Christoph M. Becker	2016-06-16	2	-33/+49
\| \|\ \ \ \
\| \| * \| \| \|	More type inference fixes	Nikita Popov	2016-06-16	2	-33/+49
\| \| \| \| \| \|
\| * \| \| \| \|	Update NEWS	Christoph M. Becker	2016-06-16	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'PHP-7.0'	Christoph M. Becker	2016-06-16	0	-0/+0
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| / / / \| \| \|/ / /
\| \| * \| \|	Update NEWS	Christoph M. Becker	2016-06-16	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-06-16	0	-0/+0
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Update NEWS	Christoph M. Becker	2016-06-16	1	-1/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'PHP-7.0'	Christoph M. Becker	2016-06-16	3	-2/+111
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge branch 'PHP-5.6' into PHP-7.0	Christoph M. Becker	2016-06-16	3	-2/+111
\| \| \|\ \ \ \| \| \| \|/ /