diff options
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/tests/gzfile_variation4.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/tests/readgzfile_variation4.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 12 | ||||
| -rw-r--r-- | ext/zlib/zlib_filter.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib_win32_howto.txt | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt index 3310231566..9b3128125a 100644 --- a/ext/zlib/tests/gzfile_variation4.phpt +++ b/ext/zlib/tests/gzfile_variation4.phpt @@ -2,7 +2,7 @@ Test function gzfile() by substituting argument 1 with float values. --SKIPIF-- <?php -if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build'); +if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?> --FILE-- <?php diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index 00211f7dfe..32f434cba2 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -2,7 +2,7 @@ Test function readgzfile() by substituting argument 1 with float values. --SKIPIF-- <?php -if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build'); +if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?> --FILE-- <?php diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 000b96ad8e..c3548eae53 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 */ diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 45ef2a8f7d..2f0d1f7706 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -386,7 +386,7 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f if ((tmpzval = zend_hash_str_find(HASH_OF(filterparams), "level", sizeof("level") - 1))) { ZVAL_COPY_VALUE(&tmp, tmpzval); - /* Psuedo pass through to catch level validating code */ + /* Pseudo pass through to catch level validating code */ goto factory_setlevel; } break; diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt index 0c46a88831..59ff3c4f4c 100644 --- a/ext/zlib/zlib_win32_howto.txt +++ b/ext/zlib/zlib_win32_howto.txt @@ -1,7 +1,7 @@ Rules for building ZLIB ----------------------- -The zlib project requires the folowing files: +The zlib project requires the following files: php_build\zlib\include\zlib.h php_build\zlib\include\zconf.h |