]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorStanislav Malyshev <stas@php.net>
Tue, 2 Jan 2018 05:07:21 +0000 (21:07 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Jan 2018 05:07:21 +0000 (21:07 -0800)
* PHP-7.1:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS

1  2 
ext/gd/libgd/gd_gif_in.c
ext/phar/tests/phar_convert_repeated.phpt

Simple merge