mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-23 12:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Jones 2011-11-29 22:33:55 +00:00
parent d1432d434c
commit 5fdb19fba0
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
php.ini-development
View File

@ -191,11 +191,6 @@
; Development Value: "GPCS" ; Development Value: "GPCS"
; Production Value: "GPCS" ; Production Value: "GPCS"
;windows.show_crt_warning
; Default value: 0
; Development value: 0
; Production value: 0
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;
; php.ini Options ; ; php.ini Options ;
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;
@ -642,6 +637,11 @@ html_errors = On
; Log errors to syslog (Event Log on NT, not valid in Windows 95). ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog ;error_log = syslog
;windows.show_crt_warning
; Default value: 0
; Development value: 0
; Production value: 0
;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;
; Data Handling ; ; Data Handling ;
;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;
@ -964,7 +964,7 @@ default_socket_timeout = 60
;extension=php_mysql.dll ;extension=php_mysql.dll
;extension=php_mysqli.dll ;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client ;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_openssl.dll
;extension=php_pdo_firebird.dll ;extension=php_pdo_firebird.dll
;extension=php_pdo_mssql.dll ;extension=php_pdo_mssql.dll
@ -1300,12 +1300,12 @@ mysqli.default_pw =
mysqli.reconnect = Off mysqli.reconnect = Off
[mysqlnd] [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. ; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_statistics ; http://php.net/mysqlnd.collect_statistics
mysqlnd.collect_statistics = On 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. ; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_memory_statistics ; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = On mysqlnd.collect_memory_statistics = On
@ -1372,7 +1372,7 @@ mysqlnd.collect_memory_statistics = On
; http://php.net/oci8.old-oci-close-semantics ; http://php.net/oci8.old-oci-close-semantics
;oci8.old_oci_close_semantics = Off ;oci8.old_oci_close_semantics = Off
[PostgresSQL] [PostgreSQL]
; Allow or prevent persistent links. ; Allow or prevent persistent links.
; http://php.net/pgsql.allow-persistent ; http://php.net/pgsql.allow-persistent
pgsql.allow_persistent = On pgsql.allow_persistent = On
@ -1604,7 +1604,6 @@ session.entropy_length = 0
; On windows, setting the entropy_length setting will activate the ; On windows, setting the entropy_length setting will activate the
; Windows random source (using the CryptoAPI) ; Windows random source (using the CryptoAPI)
;session.entropy_file = /dev/urandom ;session.entropy_file = /dev/urandom
session.entropy_file =
; Set to {nocache,private,public,} to determine HTTP caching aspects ; Set to {nocache,private,public,} to determine HTTP caching aspects
; or leave this empty to avoid sending anti-caching headers. ; or leave this empty to avoid sending anti-caching headers.

18
php.ini-production
View File

@ -191,11 +191,6 @@
; Development Value: "GPCS" ; Development Value: "GPCS"
; Production Value: "GPCS" ; Production Value: "GPCS"
;windows.show_crt_warning
; Default value: 0
; Development value: 0
; Production value: 0
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;
; php.ini Options ; ; php.ini Options ;
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;
@ -642,6 +637,11 @@ html_errors = Off
; Log errors to syslog (Event Log on NT, not valid in Windows 95). ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
;error_log = syslog ;error_log = syslog
;windows.show_crt_warning
; Default value: 0
; Development value: 0
; Production value: 0
;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;
; Data Handling ; ; Data Handling ;
;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;
@ -964,7 +964,7 @@ default_socket_timeout = 60
;extension=php_mysql.dll ;extension=php_mysql.dll
;extension=php_mysqli.dll ;extension=php_mysqli.dll
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client ;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_openssl.dll
;extension=php_pdo_firebird.dll ;extension=php_pdo_firebird.dll
;extension=php_pdo_mssql.dll ;extension=php_pdo_mssql.dll
@ -1300,12 +1300,12 @@ mysqli.default_pw =
mysqli.reconnect = Off mysqli.reconnect = Off
[mysqlnd] [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. ; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_statistics ; http://php.net/mysqlnd.collect_statistics
mysqlnd.collect_statistics = On 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. ; used to tune and monitor MySQL operations.
; http://php.net/mysqlnd.collect_memory_statistics ; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = Off mysqlnd.collect_memory_statistics = Off
@ -1372,7 +1372,7 @@ mysqlnd.collect_memory_statistics = Off
; http://php.net/oci8.old-oci-close-semantics ; http://php.net/oci8.old-oci-close-semantics
;oci8.old_oci_close_semantics = Off ;oci8.old_oci_close_semantics = Off
[PostgresSQL] [PostgreSQL]
; Allow or prevent persistent links. ; Allow or prevent persistent links.
; http://php.net/pgsql.allow-persistent ; http://php.net/pgsql.allow-persistent
pgsql.allow_persistent = On pgsql.allow_persistent = On