CVS update: php3
| From: | zeev | Date: | Sun, 13 Sep 1998 23:55:55 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1041@lists.php.net to get a copy of this message | ||
Date: Sunday September 13, 1998 @ 19:55
Author: zeev
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv5575
Modified Files:
main.c
Log Message:
Hmm, I thought I commited this register_shutdown_function() fix. Much more senile than I thought :I
Index: php3/main.c
diff -c php3/main.c:1.467 php3/main.c:1.468
*** php3/main.c:1.467 Thu Sep 10 19:56:55 1998
--- php3/main.c Sun Sep 13 19:55:54 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.467 1998/09/10 23:56:55 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.468 1998/09/13 23:55:54 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 701,713 ****
}
#endif
/* clean temporary dl's, run request shutdown's for modules */
! /* this should actualy be after the list destructor. moving, but keeping
! remarked out here. It's causing errors in a couple modules on windows
! having this too soon.
! SHUTDOWN_DEBUG("Dynamic modules");
_php3_hash_apply(&GLOBAL(module_registry), (int (*)(void *)) module_registry_cleanup);
! */
if (GLOBAL(initialized) & INIT_SYMBOL_TABLE) {
SHUTDOWN_DEBUG("Symbol table");
_php3_hash_destroy(&GLOBAL(symbol_table));
--- 701,716 ----
}
#endif
+ if (GLOBAL(initialized) & INIT_LIST) {
+ SHUTDOWN_DEBUG("Resource list");
+ destroy_resource_list();
+ GLOBAL(initialized) &= ~INIT_LIST;
+ }
+
/* clean temporary dl's, run request shutdown's for modules */
! SHUTDOWN_DEBUG("Modules");
_php3_hash_apply(&GLOBAL(module_registry), (int (*)(void *)) module_registry_cleanup);
!
if (GLOBAL(initialized) & INIT_SYMBOL_TABLE) {
SHUTDOWN_DEBUG("Symbol table");
_php3_hash_destroy(&GLOBAL(symbol_table));
***************
*** 789,805 ****
stack_destroy(&GLOBAL(variable_unassign_stack));
GLOBAL(initialized) &= ~INIT_VARIABLE_UNASSIGN_STACK;
}
-
- if (GLOBAL(initialized) & INIT_LIST) {
- SHUTDOWN_DEBUG("Resource list");
- destroy_resource_list();
- GLOBAL(initialized) &= ~INIT_LIST;
- }
-
- /* clean temporary dl's, run request shutdown's for modules */
- SHUTDOWN_DEBUG("Dynamic modules");
- _php3_hash_apply(&GLOBAL(module_registry), (int (*)(void *)) module_registry_cleanup);
-
if (GLOBAL(module_initialized) & INIT_CONSTANTS) {
/* clean temporary defined constants */
--- 792,797 ----
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net