archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Z_BLOCK breakage when built against zlib < 1.2.4

Browse source
This commit is contained in:
Daniel Lowrey 2015-05-07 09:02:30 -04:00
parent fbd1f1f282
commit 62b1293e3d
3 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/zlib/tests/deflate_add_basic.phpt
View file

@ -41,9 +41,13 @@ $flushTypes = [
'ZLIB_PARTIAL_FLUSH' => ZLIB_PARTIAL_FLUSH, 'ZLIB_PARTIAL_FLUSH' => ZLIB_PARTIAL_FLUSH,
'ZLIB_FULL_FLUSH' => ZLIB_FULL_FLUSH, 'ZLIB_FULL_FLUSH' => ZLIB_FULL_FLUSH,
'ZLIB_NO_FLUSH' => ZLIB_NO_FLUSH, 'ZLIB_NO_FLUSH' => ZLIB_NO_FLUSH,
'ZLIB_BLOCK' => ZLIB_BLOCK,
]; ];
/* Z_BLOCK is only defined when built against zlib > 1.2.3 */
if (defined(ZLIB_BLOCK)) {
$flushTypes['ZLIB_BLOCK'] = ZLIB_BLOCK;
}
foreach ($modes as $modeKey => $mode) { foreach ($modes as $modeKey => $mode) {
foreach ($flushSizes as $flushSize) { foreach ($flushSizes as $flushSize) {
foreach ($flushTypes as $flushTypeKey => $flushType) { foreach ($flushTypes as $flushTypeKey => $flushType) {

6
ext/zlib/tests/inflate_add_basic.phpt
View file

@ -40,9 +40,13 @@ $flushTypes = [
'ZLIB_PARTIAL_FLUSH' => ZLIB_PARTIAL_FLUSH, 'ZLIB_PARTIAL_FLUSH' => ZLIB_PARTIAL_FLUSH,
'ZLIB_FULL_FLUSH' => ZLIB_FULL_FLUSH, 'ZLIB_FULL_FLUSH' => ZLIB_FULL_FLUSH,
'ZLIB_NO_FLUSH' => ZLIB_NO_FLUSH, 'ZLIB_NO_FLUSH' => ZLIB_NO_FLUSH,
'ZLIB_BLOCK' => ZLIB_BLOCK,
]; ];
/* Z_BLOCK is only defined when built against zlib > 1.2.3 */
if (defined(ZLIB_BLOCK)) {
$flushTypes['ZLIB_BLOCK'] = ZLIB_BLOCK;
}
$uncompressed = ""; $uncompressed = "";
for ($i=0;$i<(32768*2);$i++) { for ($i=0;$i<(32768*2);$i++) {
$uncompressed .= chr(rand(48,125)); $uncompressed .= chr(rand(48,125));

13
ext/zlib/zlib.c
View file

@ -46,6 +46,13 @@
#undef gzseek #undef gzseek
#undef gztell #undef gztell
/* Z_BLOCK was added in zlib 1.2.4 and stable distros (RHEL6, at least) still
* package zlib 1.2.3
*/
#ifdef Z_BLOCK
#define HAVE_Z_BLOCK 1
#endif
int le_deflate; int le_deflate;
int le_inflate; int le_inflate;
@ -814,7 +821,9 @@ PHP_FUNCTION(inflate_add)
case Z_PARTIAL_FLUSH: case Z_PARTIAL_FLUSH:
case Z_SYNC_FLUSH: case Z_SYNC_FLUSH:
case Z_FULL_FLUSH: case Z_FULL_FLUSH:
#ifdef HAVE_Z_BLOCK
case Z_BLOCK: case Z_BLOCK:
#endif
case Z_FINISH: case Z_FINISH:
break; break;
@ -960,7 +969,9 @@ PHP_FUNCTION(deflate_add)
case Z_PARTIAL_FLUSH: case Z_PARTIAL_FLUSH:
case Z_SYNC_FLUSH: case Z_SYNC_FLUSH:
case Z_FULL_FLUSH: case Z_FULL_FLUSH:
#ifdef HAVE_Z_BLOCK
case Z_BLOCK: case Z_BLOCK:
#endif
case Z_FINISH: case Z_FINISH:
break; break;
@ -1268,7 +1279,9 @@ static PHP_MINIT_FUNCTION(zlib)
REGISTER_LONG_CONSTANT("ZLIB_PARTIAL_FLUSH", Z_PARTIAL_FLUSH, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_PARTIAL_FLUSH", Z_PARTIAL_FLUSH, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_SYNC_FLUSH", Z_SYNC_FLUSH, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_SYNC_FLUSH", Z_SYNC_FLUSH, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_FULL_FLUSH", Z_FULL_FLUSH, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_FULL_FLUSH", Z_FULL_FLUSH, CONST_CS|CONST_PERSISTENT);
#ifdef HAVE_Z_BLOCK
REGISTER_LONG_CONSTANT("ZLIB_BLOCK", Z_BLOCK, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_BLOCK", Z_BLOCK, CONST_CS|CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("ZLIB_FINISH", Z_FINISH, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ZLIB_FINISH", Z_FINISH, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
return SUCCESS; return SUCCESS;