phanto Tue Jan 28 18:45:03 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
somehow the module shutdown order got reversed since 4.3.0,
thus the CoInitialize / CoUninitialize calles are more sane here
than in the basic functions module.
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.7 php4/main/main.c:1.512.2.8
--- php4/main/main.c:1.512.2.7 Tue Jan 7 21:44:50 2003
+++ php4/main/main.c Tue Jan 28 18:45:02 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.7 2003/01/08 02:44:50 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.8 2003/01/28 23:45:02 phanto Exp $ */
/* {{{ includes
*/
@@ -1009,11 +1009,14 @@
php_core_globals *core_globals;
#endif
+
#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData;
#endif
#ifdef PHP_WIN32
+ CoInitialize(NULL);
+
{
DWORD dwVersion = GetVersion();
@@ -1233,6 +1236,10 @@
#endif
module_initialized = 0;
+
+#ifdef PHP_WIN32
+ CoUninitialize();
+#endif
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
