- rediff patches, merged duplicate triggers, remove unsupported Obsoletes

[packages/php.git] / php-zlib-for-getimagesize.patch

diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 50a3ec377931ae420617727b11735867b89e712e..f8eed22d682b60630a0abf00bf3dc4425c977b0d 100644 (file)
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -2,27 +2,28 @@ 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
-@@ -31,7 +31,7 @@
+diff -urNp -x '*.orig' php-7.1.33.org/ext/standard/image.c php-7.1.33/ext/standard/image.c
+--- php-7.1.33.org/ext/standard/image.c        2019-10-22 18:59:57.000000000 +0200
++++ php-7.1.33/ext/standard/image.c    2021-08-23 23:46:07.051529318 +0200
+@@ -34,7 +34,7 @@
+ #include "win32/php_stdint.h"
  #endif
- #include "php_image.h"
  
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 +#if HAVE_ZLIB
  #include "zlib.h"
  #endif
  
-@@ -80,7 +80,7 @@
+@@ -86,7 +86,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        
+ #endif
        REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -195,7 +195,7 @@ static unsigned long int php_swf_get_bit
  }
  /* }}} */
  
@@ -30,8 +31,8 @@ see also http://bugs.php.net/bug.php?id=29611
 +#if HAVE_ZLIB
  /* {{{ php_handle_swc
   */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -1321,7 +1321,7 @@
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+@@ -1393,7 +1393,7 @@ static void php_getimagesize_from_stream
                        result = php_handle_swf(stream);
                        break;
                case IMAGE_FILETYPE_SWC: