com php-src: Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6: NEWS
| From: | rdlowrey@php.net | Date: | Wed, 26 Feb 2014 20:40:16 +0000 |
| Subject: | com php-src: Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76237@lists.php.net to get a copy of this message | ||
Commit: 4b06e0a2d089997868a026e35094998c3a3c4d39
Author: Daniel Lowrey <rdlowrey@php.net> Wed, 26 Feb 2014 13:29:10 -0700
Parents: d0a6f8c68ec1044e936735f28bdc1bbd35f81362 afc24da436da20843e024538f03479df42d46ee3
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b06e0a2d089997868a026e35094998c3a3c4d39
Log:
Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6
* 'curlClosePolicy' of https://github.com/DaveRandom/php-src:
Remove cURL close policy related constants
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 0c28d48,b79f000..0d642e7
--- a/NEWS
+++ b/NEWS
@@@ -10,9 -10,6 +10,11 @@@ PH
. Implemented unified default encoding
(RFC: https://wiki.php.net/rfc/default_encoding).
(Yasuo Ohgaki)
+- Curl
+ . Check for openssl.cafile ini directive when loading CA certs. (Daniel Lowrey)
++ . Remove cURL close policy related constants as these have no effect and are
++ no longer used in libcurl. (Chris Wright)
+
- Fileinfo
. Upgraded to libmagic-5.17 (Anatol)