From: Daniel Lowrey <rdlowrey@php.net>
Date: Wed, 26 Feb 2014 20:29:10 +0000 (-0700)
Subject: Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b06e0a2d089997868a026e35094998c3a3c4d39;p=php

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
---

4b06e0a2d089997868a026e35094998c3a3c4d39
diff --cc NEWS
index 0c28d48c4a,b79f0006a9..0d642e7272
--- 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)