diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/gd/gd.c | 17 |
2 files changed, 17 insertions, 1 deletions
@@ -47,6 +47,7 @@ PHP NEWS - GD: . Fixed bug #72596 (imagetypes function won't advertise WEBP support). (cmb) . Fixed bug #72604 (imagearc() ignores thickness for full arcs). (cmb) + . Fixed bug #70315 (500 Server Error but page is fully rendered). (cmb) - Intl: . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain diff --git a/ext/gd/gd.c b/ext/gd/gd.c index a8ed6309df..c0319b2c93 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -63,6 +63,9 @@ static int le_gd, le_gd_font; #include <gd.h> +#ifndef HAVE_GD_BUNDLED +# include <gd_errors.h> +#endif #include <gdfontt.h> /* 1 Tiny font */ #include <gdfonts.h> /* 2 Small font */ #include <gdfontmb.h> /* 3 Medium bold font */ @@ -1021,7 +1024,19 @@ static void php_free_gd_font(zend_resource *rsrc) void php_gd_error_method(int type, const char *format, va_list args) { - php_verror(NULL, "", type, format, args); + switch (type) { + case GD_DEBUG: + case GD_INFO: + case GD_NOTICE: + type = E_NOTICE; + break; + case GD_WARNING: + type = E_WARNING; + break; + default: + type = E_ERROR; + } + php_verror(NULL, "", type, format, args TSRMLS_CC); } /* }}} */ #endif |