phanto          Sun Apr 22 04:58:49 2001 EDT

  Modified files:              (Branch: PHP_4_0_5)
    /php4       php.ini-dist php.ini-optimized 
  Log:
  merged [com] section from main branch
  
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.73.2.1 php4/php.ini-dist:1.73.2.2
--- php4/php.ini-dist:1.73.2.1  Thu Apr  5 19:09:43 2001
+++ php4/php.ini-dist   Sun Apr 22 04:58:49 2001
@@ -1,5 +1,5 @@
 [PHP]
-; $Id: php.ini-dist,v 1.73.2.1 2001/04/06 02:09:43 sniper Exp $
+; $Id: php.ini-dist,v 1.73.2.2 2001/04/22 11:58:49 phanto Exp $
 
 ;;;;;;;;;;;;;;;;;;;
 ; About this file ;
@@ -766,3 +766,10 @@
 [Sockets]
 ; Use the system read() function instead of the php_read() wrapper.
 sockets.use_system_read = On
+
+[com]
+; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
+;com.typelib_file = 
+
+; allow Distributed-COM calls
+;com.allow_dcom = true
Index: php4/php.ini-optimized
diff -u php4/php.ini-optimized:1.33.2.1 php4/php.ini-optimized:1.33.2.2
--- php4/php.ini-optimized:1.33.2.1     Thu Apr  5 19:09:43 2001
+++ php4/php.ini-optimized      Sun Apr 22 04:58:49 2001
@@ -500,6 +500,10 @@
 [Sockets]
 sockets.use_system_read                =       Off     ; Use the system read() 
function instead of
                                                ; the php_read() wrapper.
+[com]
+;com.typelib_file =                            ; path to a file containing GUIDs, 
+IIDs or filenames of files with TypeLibs
+;com.allow_dcom                        =       true    ; allow Distributed-COM calls
+
 ; Local Variables:
 ; tab-width: 4
 ; End:



-- 
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