]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a8931df 2ba3b27)
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 29 Dec 2016 12:31:18 +0000 (13:31 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 29 Dec 2016 12:47:28 +0000 (13:47 +0100)
commit88d1a2c5aab441fd322683f8d21667932aeec636
treefe7725d6ae59aa0eb60154f240a923d57f5be61ftree | snapshot
parenta8931df672bb173ef81c10e4fc2a5de23789c935commit | diff
parent2ba3b275948050ce600c5234b66e840b640ca5a5commit | diff
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
NEWS diff1 | diff2 | blob | history
ext/sqlite3/sqlite3.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.