X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-zlib-for-getimagesize.patch;h=9f09b2db1deb90bb67cc6c6be5487f186e0d63b9;hp=9a2bc9d2820c1bc14b8ebf758c9e72003e8b8ef7;hb=954ecf20c48c9867c06e3142115d609ad4c9e81c;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf

diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 9a2bc9d..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-4.4.1/ext/standard/image.c	2005-07-27 14:22:36.000000000 +0300
-+++ /tmp/image.c	2006-01-06 19:14:00.000000000 +0200
+--- 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,23 +20,23 @@ 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)
-@@ -1267,7 +1290,7 @@
- 			result = php_handle_swf(stream TSRMLS_CC);
+ /* {{{ php_handle_swc */
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+ {
+@@ -1321,7 +1321,7 @@
+ 			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 TSRMLS_CC);
+ 			result = php_handle_swc(stream);
  #else
- 			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.");
+ 			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");