]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f39a4ee f98ab19)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 29 Sep 2015 03:44:28 +0000 (20:44 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 29 Sep 2015 03:44:28 +0000 (20:44 -0700)
commit51b23cd0f0b35e4748fac9ca19fb7825cf382ffd
tree91b1bd2e9241abe3bf5f9fa8a7558e7c62a46306tree | snapshot
parentf39a4ee0c971177bc873d282c39ee1b670652f5ccommit | diff
parentf98ab19dc0c978e3caaa2614579e4a61f2c317f5commit | diff
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
ext/phar/dirstream.c diff1 | diff2 | blob | history
ext/phar/util.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.