This commit was manufactured by cvs2svn to create tag 'RELEASE_8_1_0'.release/8.1.0

1 files changed, 0 insertions, 50 deletions

diff --git a/lang/php53/files/patch-ext_standard_image.c b/lang/php53/files/patch-ext_standard_image.c
deleted file mode 100644
index be29b54b2650..000000000000
--- a/lang/php53/files/patch-ext_standard_image.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- ext/standard/image.c.orig	2007-10-04 15:31:11.000000000 +0200
-+++ ext/standard/image.c	2007-11-13 22:47:04.000000000 +0100
-@@ -31,9 +31,7 @@
- #endif
- #include "php_image.h"
- 
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- #include "zlib.h"
--#endif
- 
- /* file type markers */
- PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'};
-@@ -80,9 +78,7 @@
- 	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)
- 	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);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP",    IMAGE_FILETYPE_WBMP,    CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC,     CONST_CS | CONST_PERSISTENT); /* keep alias */
-@@ -184,7 +180,6 @@
- }
- /* }}} */
- 
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -255,7 +250,6 @@
- 	return result;
- }
- /* }}} */
--#endif
- 
- /* {{{ php_handle_swf
-  */
-@@ -1314,11 +1308,7 @@
- 			result = php_handle_swf(stream TSRMLS_CC);
- 			break;
- 		case IMAGE_FILETYPE_SWC:
--#if HAVE_ZLIB && !defined(COMPILE_DL_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");
--#endif
- 			break;
- 		case IMAGE_FILETYPE_PSD:
- 			result = php_handle_psd(stream TSRMLS_CC);