From: Stanislav Malyshev <stas@php.net>
Date: Sun, 19 Jun 2016 05:11:23 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~23^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c0133f0ebb956af305bda3b1d2066751d12a5b9;p=php

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
---

8c0133f0ebb956af305bda3b1d2066751d12a5b9