]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Tue, 2 Jan 2018 04:52:34 +0000 (20:52 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Jan 2018 04:52:34 +0000 (20:52 -0800)
commit92c19f8a26d314ff23f3d2cee639c6b4862c4a11
tree4e71af2b0b9c37460f50ec0d69e2e84e971d3682
parentd534d59bd81798a9dfb0dd7bed2f0d1afe63fca6
parent459ab2eef49a754ef7553266ad34991317df3c91
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
13 files changed:
ext/phar/stub.h
ext/phar/tests/cache_list/copyonwrite11.phar.phpt
ext/phar/tests/phar_commitwrite.phpt
ext/phar/tests/phar_convert_repeated.phpt
ext/phar/tests/phar_create_in_cwd.phpt
ext/phar/tests/phar_createdefaultstub.phpt
ext/phar/tests/phar_offset_check.phpt
ext/phar/tests/phar_setdefaultstub.phpt
ext/phar/tests/tar/phar_convert_phar.phpt
ext/phar/tests/tar/phar_convert_phar2.phpt
ext/phar/tests/tar/phar_convert_phar3.phpt
ext/phar/tests/tar/phar_convert_phar4.phpt
ext/phar/tests/zip/phar_convert_phar.phpt