]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adc49b1 27120d4)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Fri, 7 Apr 2017 07:20:53 +0000 (15:20 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 7 Apr 2017 07:20:53 +0000 (15:20 +0800)
commit39327b90e3eef1128c757e0970c4c9935c83f889
tree12ef39ada3d08c229128fe45c4ac4ae46e453f16tree | snapshot
parentadc49b1d18788cb8497eb176d4ac147f144f79bfcommit | diff
parent27120d4412a7122f27ac1fcd4d91090ce7979647commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)

Conflicts:
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.