diff options
| author | Julien Pauli <jpauli@php.net> | 2016-07-08 15:05:13 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-07-08 15:05:13 +0200 |
| commit | 87fe485c3562eaba4c04b5cd03d1b234ab7b2e90 (patch) | |
| tree | 4016d766a482f8c85e10055e6ac732394d396423 /sapi/cli/php_cli_server.c | |
| parent | 7ae00f08cf519cbfb14152600a994cdbc26d7868 (diff) | |
| parent | 1071a2655f22912fda662a76467bd4bb7fd22faf (diff) | |
| download | php-git-87fe485c3562eaba4c04b5cd03d1b234ab7b2e90.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Backported bug #71144 (Segmentation fault when using cURL with ZTS)
fix bug #72024 (microtime() leaks memory)
Conflicts:
ext/curl/interface.c
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions