diff options
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 | ||||
| -rw-r--r-- | ext/gd/gd.c | 10 | ||||
| -rw-r--r-- | php.ini-development | 6 | ||||
| -rw-r--r-- | php.ini-production | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 57cd54074a..6f3de90a62 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4943,7 +4943,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 cd28387271..67f8ad10ff 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1483,7 +1483,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)) { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index b55cee9cc4..e91b35a041 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2963,7 +2963,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 /* }}} */ @@ -2983,7 +2983,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 */ @@ -2994,7 +2994,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 */ @@ -3005,7 +3005,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 */ @@ -3015,7 +3015,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 */ diff --git a/php.ini-development b/php.ini-development index eedb1daa73..149dec5505 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1922,12 +1922,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 d549ae2d80..63d5c5dbfb 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1923,12 +1923,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 |