]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
authorXinchen Hui <laruence@gmail.com>
Tue, 2 Jan 2018 05:50:18 +0000 (13:50 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 2 Jan 2018 05:50:18 +0000 (13:50 +0800)
* 'PHP-7.2' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS

1  2 
ext/phar/stub.h

diff --cc ext/phar/stub.h
Simple merge