From: Adam Harvey <aharvey@php.net>
Date: Tue, 11 Mar 2014 18:06:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~491^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a14eb53c4c7bff343e0df9463c6b109c0d9f469;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

1a14eb53c4c7bff343e0df9463c6b109c0d9f469
diff --cc NEWS
index 7b664cf292,94a09272f5..727b97c096
--- 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)