sniper Mon Aug 29 10:46:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src php.ini-dist php.ini-recommended
Log:
MFH
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231&r2=1.231.2.1&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231 php-src/php.ini-dist:1.231.2.1
--- php-src/php.ini-dist:1.231 Wed Jul 13 04:20:32 2005
+++ php-src/php.ini-dist Mon Aug 29 10:46:17 2005
@@ -568,21 +568,17 @@
;extension=php_mbstring.dll
;extension=php_bz2.dll
-;extension=php_cpdf.dll
;extension=php_curl.dll
;extension=php_dba.dll
;extension=php_dbase.dll
-;extension=php_dbx.dll
;extension=php_exif.dll
;extension=php_fdf.dll
;extension=php_filepro.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
;extension=php_ifx.dll
-;extension=php_iisfunc.dll
;extension=php_imap.dll
;extension=php_interbase.dll
-;extension=php_java.dll
;extension=php_ldap.dll
;extension=php_mcrypt.dll
;extension=php_mhash.dll
@@ -594,24 +590,24 @@
;extension=php_oci8.dll
;extension=php_openssl.dll
;extension=php_oracle.dll
-;extension=php_pdf.dll
;extension=php_pgsql.dll
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
-;extension=php_w32api.dll
;extension=php_xmlrpc.dll
;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
+[Date]
+; Defines the default timezone used by the date functions
+;date.timezone =
+
[Syslog]
; Whether or not to define the various syslog variables (e.g. $LOG_PID,
; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
@@ -703,7 +699,7 @@
; SQL-Errors will be displayed.
mysql.trace_mode = Off
-[MySQLI]
+[MySQLi]
; Maximum number of links. -1 means no limit.
mysqli.max_links = -1
@@ -807,16 +803,6 @@
; Minimum client message severity to display.
sybct.min_client_severity = 10
-[dbx]
-; returned column names can be converted for compatibility reasons
-; possible values for dbx.colnames_case are
-; "unchanged" (default, if not set)
-; "lowercase"
-; "uppercase"
-; the recommended default is either upper- or lowercase, but
-; unchanged is currently set for backwards compatibility
-dbx.colnames_case = "unchanged"
-
[bcmath]
; Number of decimal digits for all bcmath functions.
bcmath.scale = 0
@@ -1063,25 +1049,6 @@
; error_reporting(0) around the eval().
;assert.quiet_eval = 0
-[Ingres II]
-; Allow or prevent persistent links.
-ingres.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ingres.max_persistent = -1
-
-; Maximum number of links, including persistents. -1 means no limit.
-ingres.max_links = -1
-
-; Default database (format: [node_id::]dbname[/srv_class]).
-ingres.default_database =
-
-; Default user.
-ingres.default_user =
-
-; Default password.
-ingres.default_password =
-
[Verisign Payflow Pro]
; Default Payflow Pro server.
pfpro.defaulthost = "test-payflow.verisign.com"
@@ -1104,7 +1071,7 @@
; Default proxy password.
;pfpro.proxypassword =
-[com]
+[COM]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
;com.typelib_file =
; allow Distributed-COM calls
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179&r2=1.179.2.1&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179 php-src/php.ini-recommended:1.179.2.1
--- php-src/php.ini-recommended:1.179 Wed Jul 13 04:20:32 2005
+++ php-src/php.ini-recommended Mon Aug 29 10:46:17 2005
@@ -626,21 +626,17 @@
;extension=php_mbstring.dll
;extension=php_bz2.dll
-;extension=php_cpdf.dll
;extension=php_curl.dll
;extension=php_dba.dll
;extension=php_dbase.dll
-;extension=php_dbx.dll
;extension=php_exif.dll
;extension=php_fdf.dll
;extension=php_filepro.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
;extension=php_ifx.dll
-;extension=php_iisfunc.dll
;extension=php_imap.dll
;extension=php_interbase.dll
-;extension=php_java.dll
;extension=php_ldap.dll
;extension=php_mcrypt.dll
;extension=php_mhash.dll
@@ -652,24 +648,24 @@
;extension=php_oci8.dll
;extension=php_openssl.dll
;extension=php_oracle.dll
-;extension=php_pdf.dll
;extension=php_pgsql.dll
;extension=php_shmop.dll
;extension=php_snmp.dll
;extension=php_sockets.dll
;extension=php_sybase_ct.dll
;extension=php_tidy.dll
-;extension=php_w32api.dll
;extension=php_xmlrpc.dll
;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
+[Date]
+; Defines the default timezone used by the date functions
+;date.timezone =
+
[Syslog]
; Whether or not to define the various syslog variables (e.g. $LOG_PID,
; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
@@ -761,7 +757,7 @@
; SQL-Errors will be displayed.
mysql.trace_mode = Off
-[MySQLI]
+[MySQLi]
; Maximum number of links. -1 means no limit.
mysqli.max_links = -1
@@ -865,16 +861,6 @@
; Minimum client message severity to display.
sybct.min_client_severity = 10
-[dbx]
-; returned column names can be converted for compatibility reasons
-; possible values for dbx.colnames_case are
-; "unchanged" (default, if not set)
-; "lowercase"
-; "uppercase"
-; the recommended default is either upper- or lowercase, but
-; unchanged is currently set for backwards compatibility
-dbx.colnames_case = "lowercase"
-
[bcmath]
; Number of decimal digits for all bcmath functions.
bcmath.scale = 0
@@ -1121,28 +1107,9 @@
; error_reporting(0) around the eval().
;assert.quiet_eval = 0
-[Ingres II]
-; Allow or prevent persistent links.
-ingres.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ingres.max_persistent = -1
-
-; Maximum number of links, including persistents. -1 means no limit.
-ingres.max_links = -1
-
-; Default database (format: [node_id::]dbname[/srv_class]).
-ingres.default_database =
-
-; Default user.
-ingres.default_user =
-
-; Default password.
-ingres.default_password =
-
[Verisign Payflow Pro]
; Default Payflow Pro server.
-pfpro.defaulthost = "test-payflow.verisign.com"
+Apfpro.defaulthost = "test-payflow.verisign.com"
; Default port to connect to.
pfpro.defaultport = 443
@@ -1162,7 +1129,7 @@
; Default proxy password.
;pfpro.proxypassword =
-[com]
+[COM]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
;com.typelib_file =
; allow Distributed-COM calls
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
