From e3c7b487099f317378cc747aea4dbe044f7faba8 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 9 Oct 2013 08:16:00 +0200
Subject: [PATCH] consolidate NEWS with 5.4

---
 NEWS | 45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 6649a4965a..b70bdcc71b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,22 +2,23 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.5.5
 
-- Buildsystem:
-  . Fixed bug #51076 (race condition in shtool's mkdir -p implementation).
-    (Mike, Raphael Geissert)
-
 - Core:
   . Fixed bug #64979 (Wrong behavior of static variables in closure generators).
     (Nikita)
+  . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita)
   . Fixed bug #65821 (By-ref foreach on property access of string offset
     segfaults). (Nikita)
 
 - CLI server:
   . Fixed bug #65633 (built-in server treat some http headers as
     case-sensitive). (Adam)
+  . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer 
+    encoding). (Felipe)
   . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)
 
 - Datetime:
+  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
+    message). (Boro Sitnikovski)
   . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
     (Boro Sitnikovski)
   . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
@@ -27,6 +28,14 @@ PHP                                                                        NEWS
   . Fixed bug #65708 (dba functions cast $key param to string in-place,
     bypassing copy on write). (Adam)
 
+- Filter:
+  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
+  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
+    (Syra)
+
+- FTP:
+  . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
+
 - GD
   . Ensure that the defined interpolation method is used with the generic
     scaling methods. (Pierre)
@@ -45,10 +54,29 @@ PHP                                                                        NEWS
   . Fixed issue #135 (segfault in interned strings if initial memory is too
     low). (Julien)
 
+- Sockets:
+  . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
+    (Mike)
+
 - SPL:
   . Fix bug #64782 (SplFileObject constructor make $context optional / give it
     a default value). (Nikita)
 
+- Standard:
+  . Fixed bug #61548 (content-type must appear at the end of headers for 201 
+    Location to work in http). (Mike)
+
+- XMLReader:
+  . Fixed bug #51936 (Crash with clone XMLReader). (Mike)
+  . Fixed bug #64230 (XMLReader does not suppress errors). (Mike)
+  
+- Build system:
+  . Fixed bug #51076 (race condition in shtool's mkdir -p implementation).
+    (Mike, Raphael Geissert)
+  . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing 
+    gzencode())). (Mike)
+
+
 19 Sep 2013, PHP 5.5.4
 
 - Core:
@@ -59,6 +87,7 @@ PHP                                                                        NEWS
     DTRACE_FUNCTION_*). (Chris Jones)
   . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding
     spaces). (Michael M Slusarz)
+  . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
   . Fixed bug #65470 (Segmentation fault in zend_error() with
     --enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
@@ -85,6 +114,10 @@ PHP                                                                        NEWS
   . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
     some cases). (Mark Jones)
 
+- PDO:
+  . Fixed bug #64953 (Postgres prepared statement positional parameter 
+    casting). (Mike)
+
 - Session:
   . Fixed bug #65475 (Session ID is not initialized properly when strict session
     is enabled). (Yasuo)
@@ -95,6 +128,10 @@ PHP                                                                        NEWS
   . Fix issue with return types of password API helper functions. Found via
     static analysis by cjones. (Anthony Ferrara) 
 
+- Zlib:
+  . Fixed bug #65391 (Unable to send vary header user-agent when 
+    ob_start('ob_gzhandler') is called) (Mike)
+
 22 Aug 2013, PHP 5.5.3
 
 - Openssl:
-- 
2.40.0