diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-11-12 11:21:40 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-11-12 11:22:48 +0100 |
| commit | 07655ffe7e86ad6505cf67b2c093dc59e87d0b01 (patch) | |
| tree | dc394f61d31c4ffb28606f850699fdb1881af2de /ext/zlib | |
| parent | 9e072d9565425c306800354e4723b340578f6ca1 (diff) | |
| parent | 65fee904622160781db05b0a469d67b4414cbd7f (diff) | |
| download | php-git-07655ffe7e86ad6505cf67b2c093dc59e87d0b01.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/zlib.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 705fb5dd5f..25804597bc 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -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 */ |