cvs: /php4 main.c /php4/ext/pcre php_pcre.c /php4/ext/standard dir.c

andi Thu Aug 19 12:52:56 1999 EDT Modified files: /php4 main.c /php4/ext/pcre php_pcre.c /php4/ext/standard dir.c Log: - Fixed memory leaks. tsrm resource id deallocation still needs to be implemented. Index: php4/main.c diff -u php4/main.c:1.97 php4/main.c:1.98 --- php4/main.c:1.97 Sat Aug 14 05:55:43 1999 +++ php4/main.c Thu Aug 19 12:52:51 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.97 1999/08/14 09:55:43 andi Exp $ */ +/* $Id: main.c,v 1.98 1999/08/19 16:52:51 andi Exp $ */ #include <stdio.h> @@ -771,6 +771,7 @@ zend_utility_values zuv; int module_number=0; /* for REGISTER_INI_ENTRIES() */ #ifdef ZTS + zend_executor_globals *executor_globals; php_core_globals *core_globals; sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id); #endif @@ -778,7 +779,6 @@ WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; #endif - ELS_FETCH(); SG(server_context) = NULL; SG(request_info).request_method = NULL; @@ -788,8 +788,6 @@ return SUCCESS; } - EG(error_reporting) = E_ALL & ~E_NOTICE; - sapi_module = *sf; zend_output_startup(); @@ -806,10 +804,12 @@ #ifdef ZTS tsrm_set_new_thread_end_handler(php_new_thread_end_handler); + executor_globals = ts_resource(executor_globals_id); core_globals_id = ts_allocate_id(sizeof(php_core_globals), NULL, NULL); core_globals = ts_resource(core_globals_id); #endif - + EG(error_reporting) = E_ALL & ~E_NOTICE; + PG(header_is_being_sent) = 0; SG(request_info).headers_only = 0; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.12 php4/ext/pcre/php_pcre.c:1.13 --- php4/ext/pcre/php_pcre.c:1.12 Mon Aug 2 15:16:49 1999 +++ php4/ext/pcre/php_pcre.c Thu Aug 19 12:52:52 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.12 1999/08/02 19:16:49 zeev Exp $ */ +/* $Id: php_pcre.c,v 1.13 1999/08/19 16:52:52 andi Exp $ */ #include "php.h" #include "php_globals.h" @@ -136,6 +136,8 @@ { #ifndef ZTS zend_hash_destroy(&PCRE_G(pcre_cache)); +#else + ts_free_id(pcre_globals_id); #endif return SUCCESS; } Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.10 php4/ext/standard/dir.c:1.11 --- php4/ext/standard/dir.c:1.10 Mon Aug 2 15:16:50 1999 +++ php4/ext/standard/dir.c Thu Aug 19 12:52:53 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.10 1999/08/02 19:16:50 zeev Exp $ */ +/* $Id: dir.c,v 1.11 1999/08/19 16:52:53 andi Exp $ */ #include "php.h" #include "fopen-wrappers.h" @@ -59,6 +59,7 @@ PHP_FALIAS(close, closedir, NULL) PHP_FALIAS(rewind, rewinddir, NULL) PHP_FALIAS(read, readdir, NULL) + {NULL, NULL, NULL} };