]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Wed, 20 Jul 2016 05:38:35 +0000 (22:38 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Jul 2016 05:38:35 +0000 (22:38 -0700)
commitdf5ee7bc2557fd87a7e296d399cd947d68c1a4d3
treee2163cddfde6d941e5184c637b4acc10027f0265
parentec97e78a8d13eb03df962f0e8604a603604b2042
parent17a53f9e60d0cd01fe271e245efa7306537acbcf
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Improve fix for #72520
  #72482, revert for 5.6 for now

Conflicts:
ext/zip/zip_stream.c
ext/gd/libgd/gd.c
ext/zip/zip_stream.c