diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-28 20:44:28 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-09-28 20:44:28 -0700 |
| commit | 51b23cd0f0b35e4748fac9ca19fb7825cf382ffd (patch) | |
| tree | 91b1bd2e9241abe3bf5f9fa8a7558e7c62a46306 /ext/pcre/php_pcre.c | |
| parent | f39a4ee0c971177bc873d282c39ee1b670652f5c (diff) | |
| parent | f98ab19dc0c978e3caaa2614579e4a61f2c317f5 (diff) | |
| download | php-git-51b23cd0f0b35e4748fac9ca19fb7825cf382ffd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions