]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0326471 07655ff)
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Wed, 12 Nov 2014 10:23:24 +0000 (11:23 +0100)
committerMatteo Beccati <mbeccati@php.net>
Wed, 12 Nov 2014 10:23:24 +0000 (11:23 +0100)
* PHP-5.6:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
  Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit.

Conflicts:
ext/session/session.c

1  2 
ext/zlib/zlib.c patch | diff1 | diff2 | blob | history

diff --cc ext/zlib/zlib.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.