diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:39:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:39:22 +0800 |
| commit | 056459dc9dad6982cbd3a0832cab611c4ac41e0f (patch) | |
| tree | 5a06d060ee65575c7580788113797b049d4f0d1c /sapi/cli/php_cli.c | |
| parent | cc3cdd00578006a5684e6dfaf81532a13326b9fe (diff) | |
| parent | efacdc3511c14f3200b31765bd0113da443e66ad (diff) | |
| download | php-git-056459dc9dad6982cbd3a0832cab611c4ac41e0f.tar.gz | |
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
* 'PHP-5.6' of https://github.com/msierks/php-src:
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