com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/curl/interface.c

Commit: 1a14eb53c4c7bff343e0df9463c6b109c0d9f469 Author: Adam Harvey <aharvey@php.net> Tue, 11 Mar 2014 11:06:39 -0700 Parents: adca4c355c9a08475fbcfa762be466a5a36e6ac9 f8252aa537e9a31d9b910f724cc5606b388ca0fb Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a14eb53c4c7bff343e0df9463c6b109c0d9f469 Log: Merge branch 'PHP-5.5' into PHP-5.6 Changed paths: MM NEWS MM ext/curl/interface.c Diff: diff --cc NEWS index 7b664cf,94a0927..727b97c --- a/NEWS +++ b/NEWS @@@ -11,20 -10,13 +11,22 @@@ PH . Added feature #65545 (SplFileObject::fread()) (Tjerk) - cURL: - . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) (Tjerk) + . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) + (Tjerk) + . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive. + (Adam) +- Date: + . Added DateTimeImmutable::createFromMutable to create a DateTimeImmutable + object from an existing DateTime (mutable) object (Derick) + - GD: - . Fixed bug #66714 ( imageconvolution breakage). (Brad Daily) - . Fixed #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre) + . Fixed bug #66815 (imagecrop(): insufficient fix for NULL defer + CVE-2013-7327). (Tomas Hoger, Remi). + +- Hash: + . Fixed bug #66698 (Missing FNV1a32 and FNV1a64 hash functions). + (Michael M Slusarz). - Mail: . Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk)