From 684f4d5272fc4a3bb1aecb14674f610227a9ca5e Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Thu, 11 Apr 2013 06:42:38 +0200 Subject: [PATCH 1/3] lucky that the name is not used, fix name of encoder --- ext/gd/gd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 0984c878aa1..87e889345cc 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2830,7 +2830,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char #if HAVE_GD_BUNDLED PHP_FUNCTION(imagexbm) { - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "GIF", gdImageXbmCtx); + _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM", gdImageXbmCtx); } #endif /* }}} */ @@ -2850,7 +2850,7 @@ PHP_FUNCTION(imagegif) Output PNG image to browser or file */ PHP_FUNCTION(imagepng) { - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "GIF", gdImagePngCtxEx); + _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImagePngCtxEx); } /* }}} */ #endif /* HAVE_GD_PNG */ @@ -2861,7 +2861,7 @@ PHP_FUNCTION(imagepng) Output PNG image to browser or file */ PHP_FUNCTION(imagewebp) { - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "GIF", gdImageWebpCtx); + _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx); } /* }}} */ #endif /* HAVE_GD_WEBP */ @@ -2872,7 +2872,7 @@ PHP_FUNCTION(imagewebp) Output JPEG image to browser or file */ PHP_FUNCTION(imagejpeg) { - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "GIF", gdImageJpegCtx); + _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageJpegCtx); } /* }}} */ #endif /* HAVE_GD_JPG */ @@ -2882,7 +2882,7 @@ PHP_FUNCTION(imagejpeg) Output WBMP image to browser or file */ PHP_FUNCTION(imagewbmp) { - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "GIF", gdImageWBMPCtx); + _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP", gdImageWBMPCtx); } /* }}} */ #endif /* HAVE_GD_WBMP */ From 6df1e8d3fe014ea9a3e42a371a16c6f9cd397bbb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Apr 2013 07:05:56 +0200 Subject: [PATCH 2/3] apply change from opcache readme to php.ini --- php.ini-development | 6 +++--- php.ini-production | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/php.ini-development b/php.ini-development index e9c7cd662f0..b23321a9db7 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1920,12 +1920,12 @@ ldap.max_links = -1 ;opcache.inherited_hack=1 ;opcache.dups_fix=0 -; The location of the OPcache blacklist file. -; The OPcache blacklist file is a text file that holds the names of files +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files ; that should not be accelerated. The file format is to add each filename ; to a new line. The filename may be a full path or just a file prefix ; (i.e., /var/www/x blacklists all the files and directories in /var/www -; that start with 'x'). +; that start with 'x'). Line starting with a ; are ignored (comments). ;opcache.blacklist_filename= ; Allows exclusion of large files from being cached. By default all files diff --git a/php.ini-production b/php.ini-production index 600debc9e75..8d1f359da4a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1920,12 +1920,12 @@ ldap.max_links = -1 ;opcache.inherited_hack=1 ;opcache.dups_fix=0 -; The location of the OPcache blacklist file. -; The OPcache blacklist file is a text file that holds the names of files +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files ; that should not be accelerated. The file format is to add each filename ; to a new line. The filename may be a full path or just a file prefix ; (i.e., /var/www/x blacklists all the files and directories in /var/www -; that start with 'x'). +; that start with 'x'). Line starting with a ; are ignored (comments). ;opcache.blacklist_filename= ; Allows exclusion of large files from being cached. By default all files From ba292b037f58c6cb0ef090936811cc658eadd26f Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 11 Apr 2013 14:28:42 +0800 Subject: [PATCH 3/3] Fixed bug (Wrong ce cached) --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 393475259eb..f051c1a5884 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4925,7 +4925,7 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST) CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } - CACHE_PTR(opline->op2.literal->cache_slot, ce); + CACHE_PTR(opline->op2.literal->cache_slot, iface); } if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 81d36888305..07082d44ff7 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1447,7 +1447,7 @@ static int ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } - CACHE_PTR(opline->op2.literal->cache_slot, ce); + CACHE_PTR(opline->op2.literal->cache_slot, iface); } if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {