com php-src: Merge branch 'PHP-5.6': ext/zlib/zlib.c
| From: | Matteo Beccati | Date: | Wed, 12 Nov 2014 10:23:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/zlib/zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83049@lists.php.net to get a copy of this message | ||
Commit: 1f1b412e5a434304289b523266f2d47483d21f84
Author: Matteo Beccati <mbeccati@php.net> Wed, 12 Nov 2014 11:23:24 +0100
Parents: 0326471a0a400829949f2e400627db84346ecf31 07655ffe7e86ad6505cf67b2c093dc59e87d0b01
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f1b412e5a434304289b523266f2d47483d21f84
Log:
Merge branch 'PHP-5.6'
* 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
Bugs:
https://bugs.php.net/53829
Changed paths:
MM ext/zlib/zlib.c
Diff: