]>
Commit | Line | Data |
---|---|---|
c0240cb1 | 1 | make compressed .swf parsing possible, |
2 | link core php with -lz for getimagesize() | |
3 | see also http://bugs.php.net/bug.php?id=29611 | |
4 | ||
592e2b99 ER |
5 | upstream: https://github.com/php/php-src/pull/4681 |
6 | ||
7 | --- php-8.2.0RC2/ext/standard/image.c~ 2022-09-14 12:42:49.000000000 +0300 | |
8 | +++ php-8.2.0RC2/ext/standard/image.c 2022-09-29 01:20:02.719689289 +0300 | |
9 | @@ -28,7 +28,7 @@ | |
c0240cb1 | 10 | #endif |
11 | #include "php_image.h" | |
12 | ||
592e2b99 ER |
13 | -#if defined(HAVE_ZLIB) && !defined(COMPILE_DL_ZLIB) |
14 | +#if defined(HAVE_ZLIB) | |
c0240cb1 | 15 | #include "zlib.h" |
16 | #endif | |
17 | ||
592e2b99 | 18 | @@ -156,7 +156,7 @@ |
c0240cb1 | 19 | } |
20 | /* }}} */ | |
21 | ||
592e2b99 ER |
22 | -#if defined(HAVE_ZLIB) && !defined(COMPILE_DL_ZLIB) |
23 | +#if defined(HAVE_ZLIB) | |
b886188f ER |
24 | /* {{{ php_handle_swc */ |
25 | static struct gfxinfo *php_handle_swc(php_stream * stream) | |
26 | { | |
592e2b99 | 27 | @@ -1454,7 +1454,7 @@ |
f4ee12ea | 28 | result = php_handle_swf(stream); |
c0240cb1 | 29 | break; |
30 | case IMAGE_FILETYPE_SWC: | |
592e2b99 ER |
31 | -#if defined(HAVE_ZLIB) && !defined(COMPILE_DL_ZLIB) |
32 | +#if defined(HAVE_ZLIB) | |
f4ee12ea | 33 | result = php_handle_swc(stream); |
c0240cb1 | 34 | #else |
f4ee12ea | 35 | php_error_docref(NULL, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); |