]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ac0501 fc46003)
Merge branch 'PHP-7.1'
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 10 Jan 2017 19:15:05 +0000 (20:15 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 10 Jan 2017 19:15:05 +0000 (20:15 +0100)
* PHP-7.1:
  Fix #73893: A hidden danger of death cycle in a function of gd

# Conflicts:
# ext/gd/libgd/gd_rotate.c

1  2 
ext/gd/libgd/gd.h patch | diff1 | diff2 | blob | history

diff --cc ext/gd/libgd/gd.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.