diff options
| author | Anatol Belski <ab@php.net> | 2016-01-29 21:07:19 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-29 21:07:19 +0100 |
| commit | 58b2344759121a332a135415d05df9335a00532f (patch) | |
| tree | 60963aa7a0e997544dddbec9de617d44a3415057 /ext/zip/php_zip.h | |
| parent | 1a9402c6ec7cbb98c8774bebdd7f576d6b822a7d (diff) | |
| parent | 6891e6abdf3c29caa465aefe80587de1db3a91ff (diff) | |
| download | php-git-58b2344759121a332a135415d05df9335a00532f.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "refix #69111 and one related test"
Revert "fix yet another leak"
add XFAIL
Revert "refix #69111 and one related test"
Revert "fix tests"
Revert "fix leak in 7.0"
add XFAIL
Revert "fix leak in 5.6"
Conflicts:
ext/session/tests/rfc1867_sid_invalid.phpt
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions