cvs: php4(PHP_4_3) /main main.c
| From: | Harald Radi | Date: | Wed, 29 Jan 2003 00:46:32 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18258@lists.php.net to get a copy of this message | ||
phanto Tue Jan 28 19:46:32 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
ilia pointet me to a thread on php-dev saying that
Co(Un)Initialize should be called per thread
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.8 php4/main/main.c:1.512.2.9
--- php4/main/main.c:1.512.2.8 Tue Jan 28 18:45:02 2003
+++ php4/main/main.c Tue Jan 28 19:46:31 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.8 2003/01/28 23:45:02 phanto Exp $ */
+/* $Id: main.c,v 1.512.2.9 2003/01/29 00:46:31 phanto Exp $ */
/* {{{ includes
*/
@@ -841,6 +841,10 @@
{
int retval = SUCCESS;
+#ifdef PHP_WIN32
+ CoInitialize(NULL);
+#endif
+
#if PHP_SIGCHILD
signal(SIGCHLD, sigchld_handler);
#endif
@@ -952,6 +956,10 @@
zend_try {
zend_unset_timeout(TSRMLS_C);
} zend_end_try();
+
+#ifdef PHP_WIN32
+ CoUninitialize();
+#endif
}
/* }}} */
@@ -1015,8 +1023,6 @@
WSADATA wsaData;
#endif
#ifdef PHP_WIN32
- CoInitialize(NULL);
-
{
DWORD dwVersion = GetVersion();
@@ -1236,10 +1242,6 @@
#endif
module_initialized = 0;
-
-#ifdef PHP_WIN32
- CoUninitialize();
-#endif
}
/* }}} */