From: Andrei Zmievski <andrei@php.net>
Date: Sat, 9 Nov 2002 00:43:37 +0000 (+0000)
Subject: Fix memory leak in non-ZTS mode.
X-Git-Tag: php-4.3.0RC1~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a60968287c8be552d4ed52f3b2884f14a033cf71;p=php

Fix memory leak in non-ZTS mode.
---

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index e3489415bd..4c83ad8a49 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -76,12 +76,10 @@ static void php_pcre_init_globals(zend_pcre_globals *pcre_globals TSRMLS_DC)
 	zend_hash_init(&pcre_globals->pcre_cache, 0, NULL, php_free_pcre_cache, 1);
 }
 
-#ifdef ZTS
 static void php_pcre_shutdown_globals(zend_pcre_globals *pcre_globals TSRMLS_DC)
 {
 	zend_hash_destroy(&pcre_globals->pcre_cache);
 }
-#endif
 
 
 static /* {{{ PHP_MINFO_FUNCTION(pcre) */
@@ -113,6 +111,10 @@ static PHP_MINIT_FUNCTION(pcre)
 /* {{{ PHP_MSHUTDOWN_FUNCTION(pcre) */
 static PHP_MSHUTDOWN_FUNCTION(pcre)
 {
+#ifndef ZTS
+	php_pcre_shutdown_globals(&pcre_globals TSRMLS_CC);
+#endif
+
 	return SUCCESS;
 }
 /* }}} */