com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/curl/interface.c
| From: | Xinchen Hui | Date: | Mon, 21 Mar 2016 08:43:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91441@lists.php.net to get a copy of this message | ||
Commit: ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278
Author: Xinchen Hui <laruence@gmail.com> Mon, 21 Mar 2016 16:43:55 +0800
Parents: 65ae7440b026440835f6fdc5d19ea9e0fde41436 c9c8e70463f61e15de36c00462debb8894b5511a
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278
Log:
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
Bugs:
https://bugs.php.net/71831
Changed paths:
MM ext/curl/interface.c
Diff: