diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-18 22:11:23 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-18 22:11:23 -0700 |
| commit | 8c0133f0ebb956af305bda3b1d2066751d12a5b9 (patch) | |
| tree | 552300da0a1e1c4dd1273f22122d0d0159a9ae8a /ext/mbstring/php_mbregex.c | |
| parent | af2c332f41c80ff0c138fbd03248be36b545c202 (diff) | |
| parent | 42b2d7fec54ec7ea0bc352c502674d6192c8a6fa (diff) | |
| download | php-git-8c0133f0ebb956af305bda3b1d2066751d12a5b9.tar.gz | |
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
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions