summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.5.17php-5.5.17PHP-5.5.17Julien Pauli2014-09-163-4/+4
* backported 2775dc2b443fc8abc3ae0a659c3a8a800ab90035Remi Collet2014-09-161-2/+1
* 5.5.17RC1php-5.5.17RC1Julien Pauli2014-09-033-4/+4
* Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-09-032-2/+28
|\
| * Fixed test with freetype >= 2.4.12Matteo Beccati2014-09-032-2/+28
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-020-0/+0
|\ \ | |/
| * 5.4.34 is nextStanislav Malyshev2014-09-023-4/+6
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-022-8/+0
|\ \ | |/
| * Revert "Fix bug #67644 - Memory corruption & crash during ob_start function c...Stanislav Malyshev2014-09-022-8/+0
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-022-0/+8
|\ \ | |/
| * Fix bug #67644 - Memory corruption & crash during ob_start function callbackStanislav Malyshev2014-09-022-0/+8
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-014-2/+20
|\ \ | |/
| * update NEWSStanislav Malyshev2014-09-011-0/+2
| * Merge branch 'pull-request/770' into PHP-5.4Stanislav Malyshev2014-09-013-2/+18
| |\
| | * Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)Keyur Govande2014-08-231-9/+12
| | * Fix typo from commit 32314f6b6Keyur Govande2014-08-141-1/+1
| | * Fix destruction order in zend_shutdown (bug #65463, #66036)Keyur Govande2014-08-143-3/+16
* | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-09-011-667/+652
|\ \ \ | |/ /
| * | - Updated to version 2014.7 (2014g)Derick Rethans2014-09-011-667/+652
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-282-3/+12
|\ \ \ | |/ /
| * | fix NEWS for fcgi fix mergeStanislav Malyshev2014-08-281-7/+11
| * | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-281-3/+8
* | | config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>Lior Kaplan2014-08-281-0/+6
* | | libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>Lior Kaplan2014-08-281-3/+9
* | | Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-273-4/+20
|\ \ \ | |/ /
| * | Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-273-4/+20
* | | fixed DBG_INF macro nameAnatol Belski2014-08-271-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-271-0/+6
|\ \ \ | |/ /
| * | update the GIT-RULES with the 5.6 and the release branchesFerenc Kovacs2014-08-271-0/+6
* | | Update NEWSDaniel Lowrey2014-08-251-0/+2
* | | Bug #67850: Build when OpenSSL compiled without SSLv3 supportDaniel Lowrey2014-08-251-0/+10
* | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-257-0/+252
|\ \ \ | |/ /
| * | Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>Lior Kaplan2014-08-257-0/+252
* | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-241-3/+1
|\ \ \ | |/ /
| * | this test depends on the simplexml ext, not just on xmlFerenc Kovacs2014-08-241-3/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-212-2/+2
|\ \ \ | |/ /
| * | fix bug #67865Michael Wallner2014-08-212-6/+6
* | | updated NEWS to fit last releaseJulien Pauli2014-08-211-10/+12
* | | NEWSRemi Collet2014-08-211-0/+1
* | | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-213-32/+32
* | | avoid clash when stdint.h was included after win32/php_stdint.hAnatol Belski2014-08-211-0/+4
* | | fix testStanislav Malyshev2014-08-201-7/+9
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-200-0/+0
|\ \ \ | |/ /
| * | NEWSRemi Collet2014-08-201-0/+3
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-200-0/+0
|\ \ \ | |/ /
| * | fixed variable corruption under win x64Anatol Belski2014-08-201-4/+4
* | | Add NEWS entry for bug #67492Lior Kaplan2014-08-201-0/+2
* | | Add NEWS entry for bug #67730Lior Kaplan2014-08-201-0/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-200-0/+0
|\ \ \ | |/ /
| * | Add NEWS entry for bug #67730Lior Kaplan2014-08-201-0/+2