]> granicus.if.org Git - php/commitdiff
Merge branch 'deflate'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 24 Apr 2015 15:02:59 +0000 (09:02 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 24 Apr 2015 15:02:59 +0000 (09:02 -0600)
* deflate:
  Add inflate_*() test cases
  Add incremental zlib inflate API
  Add deflate_*() test cases
  Several deflate_* changes (more after the jump)
  Add incremental zlib deflate API

1  2 
ext/zlib/zlib.c

diff --cc ext/zlib/zlib.c
Simple merge