X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-zlib-for-getimagesize.patch;h=9f09b2db1deb90bb67cc6c6be5487f186e0d63b9;hp=50a3ec377931ae420617727b11735867b89e712e;hb=61d0f04;hpb=f2bd7859f5c5d4890d8fb0b5087103f4c437f777

diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 50a3ec3..9f09b2d 100644
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -2,8 +2,8 @@ make compressed .swf parsing possible,
 link core php with -lz for getimagesize()
 see also http://bugs.php.net/bug.php?id=29611
 
---- php-7.0/ext/standard/image.c~	2015-05-21 23:10:45.000000000 +0300
-+++ php-7.0/ext/standard/image.c	2015-05-21 23:11:22.424948534 +0300
+--- php-8.0.0rc1/ext/standard/image.c~	2020-10-09 18:50:01.000000000 +0300
++++ php-8.0.0rc1/ext/standard/image.c	2020-10-09 18:53:44.278879164 +0300
 @@ -31,7 +31,7 @@
  #endif
  #include "php_image.h"
@@ -20,17 +20,17 @@ see also http://bugs.php.net/bug.php?id=29611
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 +#if HAVE_ZLIB
  	REGISTER_LONG_CONSTANT("IMAGETYPE_SWC",     IMAGE_FILETYPE_SWC,     CONST_CS | CONST_PERSISTENT);
- #endif	
+ #endif
  	REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -186,7 +186,7 @@
  }
  /* }}} */
  
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 +#if HAVE_ZLIB
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
+ /* {{{ php_handle_swc */
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+ {
 @@ -1321,7 +1321,7 @@
  			result = php_handle_swf(stream);
  			break;