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:
Matteo Beccati 2014-11-12 11:23:24 +01:00
commit 1f1b412e5a

View File

@ -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 */