sixd Tue, 29 Nov 2011 22:33:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=320177
Log:
Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL
dependency; remove session.entropy_file setting which was only in PHP_5_3
php.ini-development
Changed paths:
U php/php-src/branches/PHP_5_3/php.ini-development
U php/php-src/branches/PHP_5_3/php.ini-production
U php/php-src/branches/PHP_5_4/php.ini-development
U php/php-src/branches/PHP_5_4/php.ini-production
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
Modified: php/php-src/branches/PHP_5_3/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_3/php.ini-development 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/branches/PHP_5_3/php.ini-development 2011-11-29 22:33:55 UTC (rev 320177)
@@ -191,11 +191,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -642,6 +637,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -964,7 +964,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mssql.dll
@@ -1300,12 +1300,12 @@
mysqli.reconnect = Off
[mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_statistics
mysqlnd.collect_statistics = On
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = On
@@ -1372,7 +1372,7 @@
; http://php.net/oci8.old-oci-close-semantics
;oci8.old_oci_close_semantics = Off
-[PostgresSQL]
+[PostgreSQL]
; Allow or prevent persistent links.
; http://php.net/pgsql.allow-persistent
pgsql.allow_persistent = On
@@ -1604,7 +1604,6 @@
; On windows, setting the entropy_length setting will activate the
; Windows random source (using the CryptoAPI)
;session.entropy_file = /dev/urandom
-session.entropy_file =
; Set to {nocache,private,public,} to determine HTTP caching aspects
; or leave this empty to avoid sending anti-caching headers.
Modified: php/php-src/branches/PHP_5_3/php.ini-production
===================================================================
--- php/php-src/branches/PHP_5_3/php.ini-production 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/branches/PHP_5_3/php.ini-production 2011-11-29 22:33:55 UTC (rev 320177)
@@ -191,11 +191,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -642,6 +637,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -964,7 +964,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mssql.dll
@@ -1300,12 +1300,12 @@
mysqli.reconnect = Off
[mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_statistics
mysqlnd.collect_statistics = On
-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = Off
@@ -1372,7 +1372,7 @@
; http://php.net/oci8.old-oci-close-semantics
;oci8.old_oci_close_semantics = Off
-[PostgresSQL]
+[PostgreSQL]
; Allow or prevent persistent links.
; http://php.net/pgsql.allow-persistent
pgsql.allow_persistent = On
Modified: php/php-src/branches/PHP_5_4/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_4/php.ini-development 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/branches/PHP_5_4/php.ini-development 2011-11-29 22:33:55 UTC (rev 320177)
@@ -176,11 +176,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll
Modified: php/php-src/branches/PHP_5_4/php.ini-production
===================================================================
--- php/php-src/branches/PHP_5_4/php.ini-production 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/branches/PHP_5_4/php.ini-production 2011-11-29 22:33:55 UTC (rev 320177)
@@ -176,11 +176,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll
@@ -1610,6 +1610,7 @@
; Production Value: 1
; http://php.net/session.upload-progress.min-freq
;session.upload_progress.min_freq = "1"
+
[MSSQL]
; Allow or prevent persistent links.
mssql.allow_persistent = On
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/trunk/php.ini-development 2011-11-29 22:33:55 UTC (rev 320177)
@@ -176,11 +176,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2011-11-29 22:15:47 UTC (rev 320176)
+++ php/php-src/trunk/php.ini-production 2011-11-29 22:33:55 UTC (rev 320177)
@@ -176,11 +176,6 @@
; Development Value: "GPCS"
; Production Value: "GPCS"
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
;;;;;;;;;;;;;;;;;;;;
; php.ini Options ;
;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
;;;;;;;;;;;;;;;;;
; Data Handling ;
;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@
;extension=php_mysql.dll
;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll
@@ -1610,6 +1610,7 @@
; Production Value: 1
; http://php.net/session.upload-progress.min-freq
;session.upload_progress.min_freq = "1"
+
[MSSQL]
; Allow or prevent persistent links.
mssql.allow_persistent = On
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
