]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sun, 19 Jun 2016 05:11:23 +0000 (22:11 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Jun 2016 05:11:23 +0000 (22:11 -0700)
commit8c0133f0ebb956af305bda3b1d2066751d12a5b9
tree552300da0a1e1c4dd1273f22122d0d0159a9ae8a
parentaf2c332f41c80ff0c138fbd03248be36b545c202
parent42b2d7fec54ec7ea0bc352c502674d6192c8a6fa
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #72447: Type Confusion in php_bz2_filter_create()

Conflicts:
ext/bz2/bz2_filter.c