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

	Commit message (Collapse)	Author	Age	Files	Lines
*	5.5.17php-5.5.17 PHP-5.5.17	Julien Pauli	2014-09-16	3	-4/+4
\|
*	backported 2775dc2b443fc8abc3ae0a659c3a8a800ab90035	Remi Collet	2014-09-16	1	-2/+1
\|
*	5.5.17RC1php-5.5.17RC1	Julien Pauli	2014-09-03	3	-4/+4
\|
*	Merge branch 'PHP-5.4' into PHP-5.5	Matteo Beccati	2014-09-03	2	-2/+28
\|\ \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed test with freetype >= 2.4.12
\| *	Fixed test with freetype >= 2.4.12	Matteo Beccati	2014-09-03	2	-2/+28
\| \|
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-09-02	0	-0/+0
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: 5.4.34 is next Conflicts: configure.in main/php_version.h
\| *	5.4.34 is next	Stanislav Malyshev	2014-09-02	3	-4/+6
\| \|
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-09-02	2	-8/+0
\|\ \ \| \|/ \| \| \| \| \| \|	* PHP-5.4: Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
\| *	Revert "Fix bug #67644 - Memory corruption & crash during ob_start function ↵	Stanislav Malyshev	2014-09-02	2	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	callback" This reverts commit 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff. The change breaks tests, so not putting it into 5.4.
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-09-02	2	-0/+8
\|\ \ \| \|/ \| \| \| \| \| \|	* PHP-5.4: Fix bug #67644 - Memory corruption & crash during ob_start function callback
\| *	Fix bug #67644 - Memory corruption & crash during ob_start function callback	Stanislav Malyshev	2014-09-02	2	-0/+8
\| \|
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-09-01	4	-2/+20
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: update NEWS Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
\| *	update NEWS	Stanislav Malyshev	2014-09-01	1	-0/+2
\| \|
\| *	Merge branch 'pull-request/770' into PHP-5.4	Stanislav Malyshev	2014-09-01	3	-2/+18
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/770: Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
\| \| *	Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)	Keyur Govande	2014-08-23	1	-9/+12
\| \| \|
\| \| *	Fix typo from commit 32314f6b6	Keyur Govande	2014-08-14	1	-1/+1
\| \| \|
\| \| *	Fix destruction order in zend_shutdown (bug #65463, #66036)	Keyur Govande	2014-08-14	3	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If Apache or a similar SAPI receives a signal during PHP processing it calls zend_shutdown() without calling shutdown_executor(). #65463: If a module like Gearman or Memcached is loaded, in the unfixed version it is unloaded by zend_destroy_modules() before the CG(CLASS_TABLE) is destructed. When CG(CLASS_TABLE) is destructed, any pointers to methods (specifically around destruction) in the unloaded module's .so are now dangling and the process segfaults. #66036: Any subclasses of an internal class like ArrayObject need to be destructed in order: subclass first and then the internal class. In the unfixed version zend_shutdown() clears the CG(CLASS_TABLE) from the head of the list onwards, so internal classes are destructed first and user-defined classes last. Internal classes are alloc/deallocated with malloc/free while user-defined classes with emalloc/efree. If there's shared data between them then efree() could be called instead of free() leading to a seg-fault.
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Derick Rethans	2014-09-01	1	-667/+652
\|\ \ \ \| \|/ /
\| * \|	- Updated to version 2014.7 (2014g)	Derick Rethans	2014-09-01	1	-667/+652
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-08-28	2	-3/+12
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: fix NEWS for fcgi fix merge restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
\| * \|	fix NEWS for fcgi fix merge	Stanislav Malyshev	2014-08-28	1	-7/+11
\| \| \|
\| * \|	restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes ↵	David Zuelke	2014-08-28	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \|	bug 67606
* \| \|	config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>	Lior Kaplan	2014-08-28	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Based on http://git.savannah.gnu.org/cgit/config.git/commit/?id=29900d3b
* \| \|	libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>	Lior Kaplan	2014-08-28	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch created using the following changes in libtool: http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=75ffb257 http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=056889b8 http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd998a7e http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=429d40a0 http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=8a8dfaec
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Chris Wright	2014-08-27	3	-4/+20
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix stream_select() issue with OpenSSL buffer Conflicts: ext/openssl/xp_ssl.c
\| * \|	Fix stream_select() issue with OpenSSL buffer	Chris Wright	2014-08-27	3	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* \| \|	fixed DBG_INF macro name	Anatol Belski	2014-08-27	1	-1/+1
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Ferenc Kovacs	2014-08-27	1	-0/+6
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: update the GIT-RULES with the 5.6 and the release branches
\| * \|	update the GIT-RULES with the 5.6 and the release branches	Ferenc Kovacs	2014-08-27	1	-0/+6
\| \| \|
* \| \|	Update NEWS	Daniel Lowrey	2014-08-25	1	-0/+2
\| \| \|
* \| \|	Bug #67850: Build when OpenSSL compiled without SSLv3 support	Daniel Lowrey	2014-08-25	1	-0/+10
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Lior Kaplan	2014-08-25	7	-0/+252
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
\| * \|	Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>	Lior Kaplan	2014-08-25	7	-0/+252
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Ferenc Kovacs	2014-08-24	1	-3/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: this test depends on the simplexml ext, not just on xml
\| * \|	this test depends on the simplexml ext, not just on xml	Ferenc Kovacs	2014-08-24	1	-3/+1
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Michael Wallner	2014-08-21	2	-2/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: fix bug #67865
\| * \|	fix bug #67865	Michael Wallner	2014-08-21	2	-6/+6
\| \| \|
* \| \|	updated NEWS to fit last release	Julien Pauli	2014-08-21	1	-10/+12
\| \| \|
* \| \|	NEWS	Remi Collet	2014-08-21	1	-0/+1
\| \| \|
* \| \|	Fix bug #67878 program_prefix not honoured in man pages	Remi Collet	2014-08-21	3	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
* \| \|	avoid clash when stdint.h was included after win32/php_stdint.h	Anatol Belski	2014-08-21	1	-0/+4
\| \| \|
* \| \|	fix test	Stanislav Malyshev	2014-08-20	1	-7/+9
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2014-08-20	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: NEWS
\| * \|	NEWS	Remi Collet	2014-08-20	1	-0/+3
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Remi Collet	2014-08-20	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: fixed variable corruption under win x64
\| * \|	fixed variable corruption under win x64	Anatol Belski	2014-08-20	1	-4/+4
\| \| \|
* \| \|	Add NEWS entry for bug #67492	Lior Kaplan	2014-08-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Included in 5.5.14 with commit d9c5a1d
* \| \|	Add NEWS entry for bug #67730	Lior Kaplan	2014-08-20	1	-0/+2
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Lior Kaplan	2014-08-20	0	-0/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Add NEWS entry for bug #67730 Add CVE ID for bug #67539
\| * \|	Add NEWS entry for bug #67730	Lior Kaplan	2014-08-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Included in 5.4.32 with commit 706aefb