diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | UPGRADING | 3 | ||||
| -rw-r--r-- | ext/gd/gd.c | 4 | ||||
| -rw-r--r-- | ext/gd/tests/bug72596.phpt | 12 |
4 files changed, 22 insertions, 0 deletions
@@ -23,6 +23,9 @@ PHP NEWS . Fixed bug #72575 (using --allow-to-run-as-root should ignore missing user). (gooh) +- GD: + . Fixed bug #72596 (imagetypes function won't advertise WEBP support). (cmb) + - Intl: . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain names). (cmb) @@ -400,6 +400,9 @@ PHP 5.6 UPGRADE NOTES - CURL: CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 (>= 5.6.8) +- GD: + IMG_WEBP (>= 5.6.25) + - LDAP: LDAP_ESCAPE_FILTER int(1) LDAP_ESCAPE_DN int(2) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index cb070abf84..532fc5dfc0 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1148,6 +1148,7 @@ PHP_MINIT_FUNCTION(gd) REGISTER_LONG_CONSTANT("IMG_PNG", 4, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMG_WBMP", 8, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMG_XPM", 16, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_WEBP", 32, CONST_CS | CONST_PERSISTENT); /* special colours for gd */ REGISTER_LONG_CONSTANT("IMG_COLOR_TILED", gdTiled, CONST_CS | CONST_PERSISTENT); @@ -2200,6 +2201,9 @@ PHP_FUNCTION(imagetypes) #if defined(HAVE_GD_XPM) ret |= 16; #endif +#ifdef HAVE_GD_WEBP + ret |= 32; +#endif if (zend_parse_parameters_none() == FAILURE) { return; diff --git a/ext/gd/tests/bug72596.phpt b/ext/gd/tests/bug72596.phpt new file mode 100644 index 0000000000..2eb7dadb76 --- /dev/null +++ b/ext/gd/tests/bug72596.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #72596 (imagetypes function won't advertise WEBP support) +--SKIPIF-- +<?php +if (!extension_loaded('gd')) die('skip gd extension not available'); +?> +--FILE-- +<?php +var_dump(function_exists('imagewebp') === (bool) (imagetypes() & IMG_WEBP)); +?> +--EXPECT-- +bool(true) |