diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:43:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:43:55 +0800 |
| commit | ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278 (patch) | |
| tree | 83aea41d43adbd126a80ded2772ef10a4f3a4a1b /sapi/cli/php_cli.c | |
| parent | 65ae7440b026440835f6fdc5d19ea9e0fde41436 (diff) | |
| parent | c9c8e70463f61e15de36c00462debb8894b5511a (diff) | |
| download | php-git-ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS for efacdc3
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions