Merge branch 'PHP-5.5' into PHP-5.6

diff --cc NEWS
index 7b664cf292e08db66614817a43b4732c05cc481a,94a09272f5619a52dde6b99112a85614c13c698b..727b97c0964d57a67993630f2d89cfaaccbc68a3
--- 1/NEWS
--- 2/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)

diff --cc ext/curl/interface.c
Simple merge