phanto          Sun Feb 18 08:49:05 2001 EDT

  Modified files:              
    /php4/ext/com       COM.cpp 
  Log:
  @- Added new object VARIANT() to encapsulate values for use with
  @  the COM and DOTNET module. Therefore it is now possible to pass
  @  values by reference, convert php values to extended variant types (currency,
  @  date, idispatch, iunknown, ...) and define the codepage that should
  @  be used for unicode - conversion.
  
Index: php4/ext/com/COM.cpp
diff -u php4/ext/com/COM.cpp:1.3 php4/ext/com/COM.cpp:1.4
--- php4/ext/com/COM.cpp:1.3    Fri Feb 16 18:15:12 2001
+++ php4/ext/com/COM.cpp        Sun Feb 18 08:49:05 2001
@@ -234,18 +234,18 @@
                        codepage = CP_ACP;
                        break;
                case 3:
-                       if (!INI_INT("allow_dcom")) {
-                               php_error(E_WARNING, "DCOM is disabled");
-                               RETURN_FALSE;
-                       }
                        getParameters(ht, 3, &module_name, &server_name, &code_page);
 
                        if (server_name->type == IS_NULL) {
                                efree(server_name);
                                server_name = NULL;
-                       }
-                       else
+                       } else {
+                               if (!INI_INT("allow_dcom")) {
+                                       php_error(E_WARNING, "DCOM is disabled");
+                                       RETURN_FALSE;
+                               }
                                convert_to_string(server_name);
+                       }
 
                        convert_to_long(code_page);
                        codepage = code_page->value.lval;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to