Properly shut down font cache mutex

Since the font cache mutex in set up in MINIT, we have to shut it down
in MSHUTDOWN.

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 96c0e23edf699fa0b564340c277188e256f7d3d8..c3d31c8e1ad0a60e5488108beaa7e198c53fb8e6 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1029,7 +1029,7 @@ zend_module_entry gd_module_entry = {
        "gd",
        gd_functions,
        PHP_MINIT(gd),
-       NULL,
+       PHP_MSHUTDOWN(gd),
        NULL,
 #if HAVE_GD_FREETYPE && HAVE_LIBFREETYPE
        PHP_RSHUTDOWN(gd),
@@ -1238,6 +1238,17 @@ PHP_MINIT_FUNCTION(gd)
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(gd)
+{
+#if HAVE_GD_BUNDLED && HAVE_LIBFREETYPE
+       gdFontCacheMutexShutdown();
+#endif
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
 #if HAVE_GD_FREETYPE && HAVE_LIBFREETYPE

diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index e6db0c0ec0606e08c3f365c9d39516a317661594..a3e80cd3d08778ca93bb3bba56a65f16a028c717 100644 (file)
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -83,6 +83,7 @@ extern zend_module_entry gd_module_entry;
 /* gd.c functions */
 PHP_MINFO_FUNCTION(gd);
 PHP_MINIT_FUNCTION(gd);
+PHP_MSHUTDOWN_FUNCTION(gd);
 #if HAVE_GD_FREETYPE && HAVE_LIBFREETYPE
 PHP_RSHUTDOWN_FUNCTION(gd);
 #endif