Skip to content

php-zlib-for-getimagesize.patch #4681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: PHP-8.0
Choose a base branch
from
Open

php-zlib-for-getimagesize.patch #4681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9acfdc6
php-zlib-for-getimagesize.patch
glensc Jan 6, 2006
d95070f
add --with-zlib for library, --enable-zlib for extension
glensc Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ext/standard/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,20 @@ else
AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des])
fi

dnl
dnl Check for -lz
dnl
PHP_ARG_WITH([zlib],
[for ZLIB support],
[AS_HELP_STRING([--with-zlib],
[Include ZLIB support (requires zlib >= 1.2.0.4)])])

if test "$PHP_ZLIB" != "no"; then
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0.4])
LIBS="-lz $LIBS"
AC_DEFINE(HAVE_ZLIB,1,[ ])
fi

dnl
dnl Check for __attribute__ ((__aligned__)) support in the compiler
dnl
Expand Down
8 changes: 4 additions & 4 deletions ext/standard/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#endif
#include "php_image.h"

#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
#include "zlib.h"
#endif

Expand Down Expand Up @@ -79,7 +79,7 @@ PHP_MINIT_FUNCTION(imagetypes)
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT);
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT);
Expand Down Expand Up @@ -186,7 +186,7 @@ static unsigned long int php_swf_get_bits (unsigned char* buffer, unsigned int p
}
/* }}} */

#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
/* {{{ php_handle_swc */
static struct gfxinfo *php_handle_swc(php_stream * stream)
{
Expand Down Expand Up @@ -1398,7 +1398,7 @@ static void php_getimagesize_from_stream(php_stream *stream, char *input, zval *
result = php_handle_swf(stream);
break;
case IMAGE_FILETYPE_SWC:
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
result = php_handle_swc(stream);
#else
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");
Expand Down
13 changes: 5 additions & 8 deletions ext/zlib/config0.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
PHP_ARG_WITH([zlib],
[for ZLIB support],
[AS_HELP_STRING([--with-zlib],
[Include ZLIB support (requires zlib >= 1.2.0.4)])])
PHP_ARG_ENABLE([zlib],
[whether to enable zlib extension],
[AS_HELP_STRING([--enable-zlib],
[Enable zlib extension])],
[no])

if test "$PHP_ZLIB" != "no"; then
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0.4])

PHP_EVAL_LIBLINE($ZLIB_LIBS, ZLIB_SHARED_LIBADD)
PHP_EVAL_INCLINE($ZLIB_CFLAGS)

AC_DEFINE(HAVE_ZLIB,1,[ ])

PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_SUBST(ZLIB_SHARED_LIBADD)
fi