moriyoshi Sat Nov 23 17:11:59 2002 EDT
Modified files:
/php4/ext/gd gd.c php_gd.h
Log:
Fixed leaks. Other leaks are originated in libgd.
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.226 php4/ext/gd/gd.c:1.227
--- php4/ext/gd/gd.c:1.226 Sat Nov 23 14:20:44 2002
+++ php4/ext/gd/gd.c Sat Nov 23 17:11:59 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.226 2002/11/23 19:20:44 sniper Exp $ */
+/* $Id: gd.c,v 1.227 2002/11/23 22:11:59 moriyoshi Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -320,7 +320,7 @@
PHP_MINIT(gd),
NULL,
NULL,
- NULL,
+ PHP_RSHUTDOWN(gd),
PHP_MINFO(gd),
NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
@@ -407,6 +407,17 @@
/* End Section Filters */
#else
REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT);
+#endif
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RSHUTDOWN_FUNCTION
+ */
+PHP_RSHUTDOWN_FUNCTION(gd)
+{
+#if HAVE_LIBGD20
+ gdFreeFontCache();
#endif
return SUCCESS;
}
Index: php4/ext/gd/php_gd.h
diff -u php4/ext/gd/php_gd.h:1.45 php4/ext/gd/php_gd.h:1.46
--- php4/ext/gd/php_gd.h:1.45 Wed Nov 13 15:02:58 2002
+++ php4/ext/gd/php_gd.h Sat Nov 23 17:11:59 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.45 2002/11/13 20:02:58 iliaa Exp $ */
+/* $Id: php_gd.h,v 1.46 2002/11/23 22:11:59 moriyoshi Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -58,6 +58,7 @@
PHP_MINFO_FUNCTION(gd);
PHP_MINIT_FUNCTION(gd);
PHP_MSHUTDOWN_FUNCTION(gd);
+PHP_RSHUTDOWN_FUNCTION(gd);
PHP_FUNCTION(gd_info);
PHP_FUNCTION(imagearc);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
