]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2' into PHP-7.3
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Nov 2018 11:56:43 +0000 (12:56 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Nov 2018 11:57:44 +0000 (12:57 +0100)
commitcaabf3a1bbddca8c467ee9733450153ce2ab6cef
treeb08a3fb9890e646fdcf9e9f9f4610c542f2b3e0d
parent2979c6a56ddcf45113dd30ca3ed90880dfabc972
parent60a9f7a3a3502bfb7118f7fc5c06f9fdf713efad
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77195: Incorrect error handling of imagecreatefromjpeg()
NEWS
ext/gd/libgd/gd_jpeg.c