summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-12-29 13:31:18 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2016-12-29 13:47:28 +0100
commit88d1a2c5aab441fd322683f8d21667932aeec636 (patch)
treefe7725d6ae59aa0eb60154f240a923d57f5be61f /NEWS
parenta8931df672bb173ef81c10e4fc2a5de23789c935 (diff)
parent2ba3b275948050ce600c5234b66e840b640ca5a5 (diff)
downloadphp-git-88d1a2c5aab441fd322683f8d21667932aeec636.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Revert "Fix #73530: Unsetting result set may reset other result set" # Conflicts: # ext/sqlite3/sqlite3.c
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index d22471418e..90c68e23bd 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,10 @@ PHP NEWS
- Reflection:
. Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
+- SQLite3:
+ . Reverted fix for bug #73530 (Unsetting result set may reset other result
+ set). (cmb)
+
- Standard:
. Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
(Bruce Weirdan)