- rediff patches, merged duplicate triggers

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

diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 9a2bc9d2820c1bc14b8ebf758c9e72003e8b8ef7..962a48dbbb4db914f1de510a9f9275cef2039b2f 100644 (file)
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -2,18 +2,19 @@ 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
-@@ -31,7 +31,7 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/standard/image.c php-5.6.40/ext/standard/image.c
+--- php-5.6.40.org/ext/standard/image.c        2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/standard/image.c    2021-08-23 23:19:16.415803070 +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 @@
+@@ -84,7 +84,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);
@@ -22,7 +23,7 @@ see also http://bugs.php.net/bug.php?id=29611
        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);
-@@ -184,7 +184,7 @@
+@@ -192,7 +192,7 @@ static unsigned long int php_swf_get_bit
  }
  /* }}} */
  
@@ -31,7 +32,7 @@ see also http://bugs.php.net/bug.php?id=29611
  /* {{{ php_handle_swc
   */
  static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -1267,7 +1290,7 @@
+@@ -1321,7 +1321,7 @@ static void php_getimagesize_from_stream
                        result = php_handle_swf(stream TSRMLS_CC);
                        break;
                case IMAGE_FILETYPE_SWC:
@@ -39,4 +40,4 @@ see also http://bugs.php.net/bug.php?id=29611
 +#if HAVE_ZLIB
                        result = php_handle_swc(stream TSRMLS_CC);
  #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 TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");