mirror of
https://github.com/php/php-src.git
synced 2024-11-28 04:14:26 +08:00
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
This commit is contained in:
commit
1f1b412e5a
@ -34,6 +34,18 @@
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "php_zlib.h"
|
||||
|
||||
/*
|
||||
* zlib include files can define the following preprocessor defines which rename
|
||||
* the corresponding PHP functions to gzopen64, gzseek64 and gztell64 and thereby
|
||||
* breaking some software, most notably PEAR's Archive_Tar, which halts execution
|
||||
* without error message on gzip compressed archivesa.
|
||||
*
|
||||
* This only seems to happen on 32bit systems with large file support.
|
||||
*/
|
||||
#undef gzopen
|
||||
#undef gzseek
|
||||
#undef gztell
|
||||
|
||||
ZEND_DECLARE_MODULE_GLOBALS(zlib);
|
||||
|
||||
/* {{{ Memory management wrappers */
|
||||
|
Loading…
Reference in New Issue
Block a user