cvs: php4(PHP_4_0_7) /main main.c
| From: | Thies C. Arntzen | Date: | Thu, 16 Aug 2001 09:41:27 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6884@lists.php.net to get a copy of this message | ||
thies Thu Aug 16 05:41:27 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/main main.c
Log:
MFH: move php_shutdown_config further down
Index: php4/main/main.c
diff -u php4/main/main.c:1.404 php4/main/main.c:1.404.2.1
--- php4/main/main.c:1.404 Sat Aug 11 18:55:00 2001
+++ php4/main/main.c Thu Aug 16 05:41:25 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.404 2001/08/11 22:55:00 zeev Exp $ */
+/* $Id: main.c,v 1.404.2.1 2001/08/16 09:41:25 thies Exp $ */
/* {{{ includes
*/
@@ -985,9 +985,6 @@
return;
}
- /* close down the ini config */
- php_shutdown_config();
-
#ifdef PHP_WIN32
/*close winsock */
WSACleanup();
@@ -1000,12 +997,17 @@
php_shutdown_fopen_wrappers(TSRMLS_C);
php_shutdown_info_logos();
UNREGISTER_INI_ENTRIES();
+
+ /* close down the ini config */
+ php_shutdown_config();
+
#ifdef ZTS
ts_free_thread();
#else
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(0, 1);
#endif
+
module_initialized = 0;
}
/* }}} */