Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge news entries from 5.5php-7.1.0alpha2 | Joe Watkins | 2016-06-22 | 1 | -0/+25 |
* | bump version for release | Joe Watkins | 2016-06-22 | 3 | -4/+4 |
* | Merge branch 'PHP-7.0' | Ferenc Kovacs | 2016-06-22 | 0 | -0/+0 |
|\ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Ferenc Kovacs | 2016-06-22 | 0 | -0/+0 |
| |\ | |||||
| | * | update NEWS | Ferenc Kovacs | 2016-06-22 | 1 | -0/+34 |
* | | | Fixed test according to FR #46600 ("_empty_" key in objects) | Dmitry Stogov | 2016-06-22 | 1 | -3/+3 |
* | | | Fixed compilation warnings | Dmitry Stogov | 2016-06-22 | 87 | -810/+851 |
* | | | Enable Zend signals by default | Dmitry Stogov | 2016-06-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into zend_signals | Dmitry Stogov | 2016-06-20 | 8 | -18/+18 |
| |\ \ \ | |||||
| * | | | | Improved support for zend-signals. | Dmitry Stogov | 2016-06-20 | 2 | -0/+3 |
| * | | | | Merge branch 'master' into zend_signals | Dmitry Stogov | 2016-06-20 | 2 | -8/+55 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into zend_signals | Dmitry Stogov | 2016-06-20 | 13 | -8/+104 |
| |\ \ \ \ \ | |||||
| * | | | | | | Enable Zend signals by default | Dmitry Stogov | 2016-06-20 | 1 | -2/+2 |
* | | | | | | | Fixed compilation warnings | Dmitry Stogov | 2016-06-21 | 20 | -72/+71 |
* | | | | | | | Restored signed format specifier | Dmitry Stogov | 2016-06-21 | 1 | -3/+3 |
* | | | | | | | Revert "sync tests with the latest format fixes" | Dmitry Stogov | 2016-06-21 | 2 | -3/+3 |
* | | | | | | | sync tests with the latest format fixes | Anatol Belski | 2016-06-21 | 2 | -3/+3 |
* | | | | | | | fix include order | Anatol Belski | 2016-06-21 | 3 | -3/+6 |
* | | | | | | | fix typos | Anatol Belski | 2016-06-21 | 1 | -3/+3 |
* | | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 2 | -5/+32 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | fix two remaining tests | Anatol Belski | 2016-06-21 | 2 | -5/+32 |
* | | | | | | | Fixed compilation warnings | Dmitry Stogov | 2016-06-21 | 12 | -36/+51 |
* | | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-06-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | fix test | Anatol Belski | 2016-06-21 | 1 | -3/+3 |
* | | | | | | | Merge branch 'master' of git.php.net:php-src | Dmitry Stogov | 2016-06-21 | 1 | -7/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | re-fix leak | Anatol Belski | 2016-06-21 | 1 | -0/+1 |
| | * | | | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-06-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | re-fix leak | Anatol Belski | 2016-06-21 | 1 | -0/+1 |
| | | * | | | | | Revert "fix leak" | Anatol Belski | 2016-06-21 | 1 | -4/+0 |
| * | | | | | | | Merge branch 'master' of git.php.net:php-src | Anatol Belski | 2016-06-21 | 92 | -257/+261 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Revert "fix leak" | Anatol Belski | 2016-06-21 | 1 | -7/+0 |
* | | | | | | | | | Fixed compilation warnings | Dmitry Stogov | 2016-06-21 | 12 | -41/+50 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions. | Dmitry Stogov | 2016-06-21 | 92 | -257/+261 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-06-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | fix leak | Anatol Belski | 2016-06-21 | 1 | -0/+4 |
| * | | | | | | fix leak | Anatol Belski | 2016-06-21 | 1 | -0/+7 |
* | | | | | | | Merge branch 'PHP-7.0' | Remi Collet | 2016-06-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | bump zip version | Remi Collet | 2016-06-21 | 1 | -1/+1 |
* | | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-06-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2016-06-21 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | remove the huge test file, generate it on the fly instead | Anatol Belski | 2016-06-21 | 2 | -1/+23 |
| | * | | | | | | remove the huge test file, generate it on the fly instead | Anatol Belski | 2016-06-21 | 2 | -1/+23 |
* | | | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-06-21 | 2 | -1/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | remove the huge test file, generate it on the fly instead | Anatol Belski | 2016-06-21 | 2 | -1/+23 |
* | | | | | | | | Merge branch 'PHP-7.0' | Stanislav Malyshev | 2016-06-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |