summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-08-19 16:52:53 +0000
committerAndi Gutmans <andi@php.net>1999-08-19 16:52:53 +0000
commitaeec4e198a348ab782d2c3dd543218e849b27299 (patch)
tree5a547cff6b34e3b80d2bfe4b7715c2ce0a8c48ac /ext
parente5fbf4414a1026aa14543eb64634c223e0431969 (diff)
downloadphp-git-aeec4e198a348ab782d2c3dd543218e849b27299.tar.gz
- Fixed memory leaks. tsrm resource id deallocation still needs to be implemented.
Diffstat (limited to 'ext')
-rw-r--r--ext/pcre/php_pcre.c2
-rw-r--r--ext/standard/dir.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index ab696ad301..f11959df7e 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -136,6 +136,8 @@ int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS)
{
#ifndef ZTS
zend_hash_destroy(&PCRE_G(pcre_cache));
+#else
+ ts_free_id(pcre_globals_id);
#endif
return SUCCESS;
}
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 4ea03c2ecb..dc5705913b 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -59,6 +59,7 @@ static zend_function_entry php_dir_class_functions[] = {
PHP_FALIAS(close, closedir, NULL)
PHP_FALIAS(rewind, rewinddir, NULL)
PHP_FALIAS(read, readdir, NULL)
+ {NULL, NULL, NULL}
};