]>
Commit | Line | Data |
---|---|---|
e1f43fc6 ER |
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 | ||
5 | --- php-4.4.1/ext/zlib/config0.m4~ 2006-01-06 19:09:51.000000000 +0200 | |
6 | +++ php-4.4.1/ext/zlib/config0.m4 2006-01-06 19:09:52.000000000 +0200 | |
7 | @@ -49,5 +49,6 @@ | |
8 | PHP_ZLIB_DIR=$ZLIB_DIR | |
9 | PHP_ADD_LIBRARY(z,, ZLIB_SHARED_LIBADD) | |
10 | PHP_ADD_INCLUDE($ZLIB_INCDIR) | |
11 | + EXTRA_LIBS="$EXTRA_LIBS $ZLIB_SHARED_LIBADD" | |
12 | ||
13 | fi | |
14 | --- php-4.4.1/ext/standard/image.c 2005-07-27 14:22:36.000000000 +0300 | |
15 | +++ /tmp/image.c 2006-01-06 19:14:00.000000000 +0200 | |
16 | @@ -31,7 +31,7 @@ | |
17 | #endif | |
18 | #include "php_image.h" | |
19 | ||
20 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
21 | +#if HAVE_ZLIB | |
22 | #include "zlib.h" | |
23 | #endif | |
24 | ||
25 | @@ -80,7 +80,7 @@ | |
26 | REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); | |
27 | REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); | |
28 | REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); | |
29 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
30 | +#if HAVE_ZLIB | |
31 | REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); | |
32 | #endif | |
33 | REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); | |
34 | @@ -184,7 +184,7 @@ | |
35 | } | |
36 | /* }}} */ | |
37 | ||
38 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
39 | +#if HAVE_ZLIB | |
40 | /* {{{ php_handle_swc | |
41 | */ | |
42 | static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) | |
43 | @@ -1267,7 +1290,7 @@ | |
44 | result = php_handle_swf(stream TSRMLS_CC); | |
45 | break; | |
46 | case IMAGE_FILETYPE_SWC: | |
47 | -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) | |
48 | +#if HAVE_ZLIB | |
49 | result = php_handle_swc(stream TSRMLS_CC); | |
50 | #else | |
51 | 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."); |