projects / packages / php.git / blame
| 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 | ||
| 791b59e4 JR |
5 | diff -urNp -x '*.orig' php-5.6.40.org/ext/standard/image.c php-5.6.40/ext/standard/image.c |
| 6 | --- php-5.6.40.org/ext/standard/image.c 2019-01-09 10:54:13.000000000 +0100 | |
| 7 | +++ php-5.6.40/ext/standard/image.c 2021-08-23 23:19:16.415803070 +0200 | |
| 8 | @@ -34,7 +34,7 @@ | |
| 9 | #include "win32/php_stdint.h" | |
| c0240cb1 | 10 | #endif |
| c0240cb1 | 11 | |
| 12 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
| 13 | +#if HAVE_ZLIB | |
| 14 | #include "zlib.h" | |
| 15 | #endif | |
| 16 | ||
| 791b59e4 | 17 | @@ -84,7 +84,7 @@ PHP_MINIT_FUNCTION(imagetypes) |
| c0240cb1 | 18 | REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); |
| 19 | REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); | |
| 20 | REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); | |
| 21 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
| 22 | +#if HAVE_ZLIB | |
| 23 | REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); | |
| 24 | #endif | |
| 25 | REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); | |
| 791b59e4 | 26 | @@ -192,7 +192,7 @@ static unsigned long int php_swf_get_bit |
| c0240cb1 | 27 | } |
| 28 | /* }}} */ | |
| 29 | ||
| 30 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
| 31 | +#if HAVE_ZLIB | |
| 32 | /* {{{ php_handle_swc | |
| 33 | */ | |
| 34 | static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) | |
| 791b59e4 | 35 | @@ -1321,7 +1321,7 @@ static void php_getimagesize_from_stream |
| c0240cb1 | 36 | result = php_handle_swf(stream TSRMLS_CC); |
| 37 | break; | |
| 38 | case IMAGE_FILETYPE_SWC: | |
| 39 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
| 40 | +#if HAVE_ZLIB | |
| 41 | result = php_handle_swc(stream TSRMLS_CC); | |
| 42 | #else | |
| 791b59e4 | 43 | php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); |