[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard basic_functions.c

[Ilia Alshanetsky]

iliaa           Mon Dec  2 01:45:58 2002 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  basic_functions.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.543 
php4/ext/standard/basic_functions.c:1.543.2.1
--- php4/ext/standard/basic_functions.c:1.543   Fri Nov  8 10:49:32 2002
+++ php4/ext/standard/basic_functions.c Mon Dec  2 01:45:57 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.543 2002/11/08 15:49:32 sterling Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.1 2002/12/02 06:45:57 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -959,10 +959,6 @@
        memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state)));
        memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex)));
 
-#ifdef PHP_WIN32
-       CoInitialize(NULL);
-#endif
-
        BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
 }
 
@@ -973,9 +969,6 @@
        if (BG(sm_allowed_env_vars)) {
                free(BG(sm_allowed_env_vars));
        }
-#ifdef PHP_WIN32
-       CoUninitialize();
-#endif
 }
 
 
@@ -1102,6 +1095,10 @@
 
 PHP_RINIT_FUNCTION(basic)
 {
+#ifdef PHP_WIN32
+       CoInitialize(NULL);
+#endif
+
        memset(BG(strtok_table), 0, 256);
        BG(strtok_string) = NULL;
        BG(strtok_zval) = NULL;
@@ -1182,6 +1179,10 @@
        if (BG(mmap_file)) {
                munmap(BG(mmap_file), BG(mmap_len));
        }
+#endif
+
+#ifdef PHP_WIN32
+       CoUninitialize();
 #endif
 
        return SUCCESS;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php