diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 22:21:35 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 22:22:01 -0800 |
| commit | e0b6e5222bcb02733ca4ad66d6b982b8ed3b9d0e (patch) | |
| tree | 8515a0a6f247a848829331f733de9287d8f7553f /sapi/cli/php_cli.c | |
| parent | 85bada10c16792bbe63b68246284dde30a31327d (diff) | |
| parent | f75da60b18f12fb986179caf59523921e9f49bbc (diff) | |
| download | php-git-e0b6e5222bcb02733ca4ad66d6b982b8ed3b9d0e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions