summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge news entries from 5.5php-7.1.0alpha2Joe Watkins2016-06-221-0/+25
* bump version for releaseJoe Watkins2016-06-223-4/+4
* Merge branch 'PHP-7.0'Ferenc Kovacs2016-06-220-0/+0
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-06-220-0/+0
| |\
| | * update NEWSFerenc Kovacs2016-06-221-0/+34
* | | Fixed test according to FR #46600 ("_empty_" key in objects)Dmitry Stogov2016-06-221-3/+3
* | | Fixed compilation warningsDmitry Stogov2016-06-2287-810/+851
* | | Enable Zend signals by defaultDmitry Stogov2016-06-211-2/+2
|\ \ \
| * \ \ Merge branch 'master' into zend_signalsDmitry Stogov2016-06-208-18/+18
| |\ \ \
| * | | | Improved support for zend-signals.Dmitry Stogov2016-06-202-0/+3
| * | | | Merge branch 'master' into zend_signalsDmitry Stogov2016-06-202-8/+55
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into zend_signalsDmitry Stogov2016-06-2013-8/+104
| |\ \ \ \ \
| * | | | | | Enable Zend signals by defaultDmitry Stogov2016-06-201-2/+2
* | | | | | | Fixed compilation warningsDmitry Stogov2016-06-2120-72/+71
* | | | | | | Restored signed format specifierDmitry Stogov2016-06-211-3/+3
* | | | | | | Revert "sync tests with the latest format fixes"Dmitry Stogov2016-06-212-3/+3
* | | | | | | sync tests with the latest format fixesAnatol Belski2016-06-212-3/+3
* | | | | | | fix include orderAnatol Belski2016-06-213-3/+6
* | | | | | | fix typosAnatol Belski2016-06-211-3/+3
* | | | | | | Merge branch 'PHP-7.0'Anatol Belski2016-06-212-5/+32
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | fix two remaining testsAnatol Belski2016-06-212-5/+32
* | | | | | | Fixed compilation warningsDmitry Stogov2016-06-2112-36/+51
* | | | | | | Merge branch 'PHP-7.0'Anatol Belski2016-06-211-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-211-3/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | fix testAnatol Belski2016-06-211-3/+3
* | | | | | | Merge branch 'master' of git.php.net:php-srcDmitry Stogov2016-06-211-7/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-7.0'Anatol Belski2016-06-211-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | re-fix leakAnatol Belski2016-06-211-0/+1
| | * | | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-210-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | re-fix leakAnatol Belski2016-06-211-0/+1
| | | * | | | | Revert "fix leak"Anatol Belski2016-06-211-4/+0
| * | | | | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2016-06-2192-257/+261
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'PHP-7.0'Anatol Belski2016-06-211-7/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Revert "fix leak"Anatol Belski2016-06-211-7/+0
* | | | | | | | | Fixed compilation warningsDmitry Stogov2016-06-2112-41/+50
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-2192-257/+261
|/ / / / / / /
* | | | | | | Merge branch 'PHP-7.0'Anatol Belski2016-06-211-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | fix leakAnatol Belski2016-06-211-0/+4
| * | | | | | fix leakAnatol Belski2016-06-211-0/+7
* | | | | | | Merge branch 'PHP-7.0'Remi Collet2016-06-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | bump zip versionRemi Collet2016-06-211-1/+1
* | | | | | | Merge branch 'PHP-7.0'Anatol Belski2016-06-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2016-06-210-0/+0
| | |\ \ \ \ \
| | | * | | | | remove the huge test file, generate it on the fly insteadAnatol Belski2016-06-212-1/+23
| | * | | | | | remove the huge test file, generate it on the fly insteadAnatol Belski2016-06-212-1/+23
* | | | | | | | Merge branch 'PHP-7.0'Anatol Belski2016-06-212-1/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | remove the huge test file, generate it on the fly insteadAnatol Belski2016-06-212-1/+23
* | | | | | | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-06-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /