cvs: php4 /ext/standard basic_functions.c
| From: | Zeev Suraski | Date: | Fri, 11 Aug 2000 13:30:38 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1143@lists.php.net to get a copy of this message | ||
zeev Fri Aug 11 06:30:38 2000 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Make COM work in a multithreaded environment
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.234 php4/ext/standard/basic_functions.c:1.235
--- php4/ext/standard/basic_functions.c:1.234 Wed Aug 9 10:52:30 2000
+++ php4/ext/standard/basic_functions.c Fri Aug 11 06:30:37 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.234 2000/08/09 17:52:30 thies Exp $ */
+/* $Id: basic_functions.c,v 1.235 2000/08/11 13:30:37 zeev Exp $ */
#include "php.h"
#include "php_main.h"
@@ -620,6 +620,9 @@
BG(left) = -1;
zend_hash_init(&BG(sm_protected_env_vars), 5, NULL, NULL, 1);
BG(sm_allowed_env_vars) = NULL;
+#ifdef PHP_WIN32
+ CoInitialize(NULL);
+#endif
}
static void basic_globals_dtor(BLS_D)
@@ -628,6 +631,9 @@
if (BG(sm_allowed_env_vars)) {
free(BG(sm_allowed_env_vars));
}
+#ifdef PHP_WIN32
+ CoUninitialize();
+#endif
}