From ab66152c686980005e638cf9db852006d9416e65 Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 9 Jul 2015 20:01:37 +0200
Subject: move the use-after-free fixes to 5.6.11

---
 NEWS | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index d4a4561150..ff69dc61a5 100644
--- a/NEWS
+++ b/NEWS
@@ -17,14 +17,6 @@ PHP                                                                        NEWS
   . Fixed bug #69882 (OpenSSL error “key values mismatch” after 
     openssl_pkcs12_read with extra cert) (Tomasz Sawicki)
 
-- SPL:
-  . Fixed bug #69970 (Use-after-free vulnerability in
-    spl_recursive_it_move_forward_ex()). (Laruence)
-
-- Sqlite3:
-  . Fixed bug #69972 (Use-after-free vulnerability in
-    sqlite3SafetyCheckSickOrOk()). (Laruence)
-
 09 Jul 2015, PHP 5.6.11
 
 - Core:
@@ -74,6 +66,12 @@ PHP                                                                        NEWS
   . Fixed bug #69737 (Segfault when SplMinHeap::compare produces fatal error).
     (Stas)
   . Fixed bug #67805 (SplFileObject setMaxLineLength). (Willian Gustavo Veiga).
+  . Fixed bug #69970 (Use-after-free vulnerability in
+    spl_recursive_it_move_forward_ex()). (Laruence)
+
+- Sqlite3:
+  . Fixed bug #69972 (Use-after-free vulnerability in
+    sqlite3SafetyCheckSickOrOk()). (Laruence)
 
 11 Jun 2015, PHP 5.6.10
 
-- 
cgit v1.2.1