Skip to content

Commit 5fdb19f

Browse files
committed
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
1 parent d1432d4 commit 5fdb19f

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

php.ini-development

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,6 @@
191191
; Development Value: "GPCS"
192192
; Production Value: "GPCS"
193193

194-
;windows.show_crt_warning
195-
; Default value: 0
196-
; Development value: 0
197-
; Production value: 0
198-
199194
;;;;;;;;;;;;;;;;;;;;
200195
; php.ini Options ;
201196
;;;;;;;;;;;;;;;;;;;;
@@ -642,6 +637,11 @@ html_errors = On
642637
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
643638
;error_log = syslog
644639

640+
;windows.show_crt_warning
641+
; Default value: 0
642+
; Development value: 0
643+
; Production value: 0
644+
645645
;;;;;;;;;;;;;;;;;
646646
; Data Handling ;
647647
;;;;;;;;;;;;;;;;;
@@ -964,7 +964,7 @@ default_socket_timeout = 60
964964
;extension=php_mysql.dll
965965
;extension=php_mysqli.dll
966966
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
967-
;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
967+
;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
968968
;extension=php_openssl.dll
969969
;extension=php_pdo_firebird.dll
970970
;extension=php_pdo_mssql.dll
@@ -1300,12 +1300,12 @@ mysqli.default_pw =
13001300
mysqli.reconnect = Off
13011301

13021302
[mysqlnd]
1303-
; Enable / Disable collection of general statstics by mysqlnd which can be
1303+
; Enable / Disable collection of general statistics by mysqlnd which can be
13041304
; used to tune and monitor MySQL operations.
13051305
; http://php.net/mysqlnd.collect_statistics
13061306
mysqlnd.collect_statistics = On
13071307

1308-
; Enable / Disable collection of memory usage statstics by mysqlnd which can be
1308+
; Enable / Disable collection of memory usage statistics by mysqlnd which can be
13091309
; used to tune and monitor MySQL operations.
13101310
; http://php.net/mysqlnd.collect_memory_statistics
13111311
mysqlnd.collect_memory_statistics = On
@@ -1372,7 +1372,7 @@ mysqlnd.collect_memory_statistics = On
13721372
; http://php.net/oci8.old-oci-close-semantics
13731373
;oci8.old_oci_close_semantics = Off
13741374

1375-
[PostgresSQL]
1375+
[PostgreSQL]
13761376
; Allow or prevent persistent links.
13771377
; http://php.net/pgsql.allow-persistent
13781378
pgsql.allow_persistent = On
@@ -1604,7 +1604,6 @@ session.entropy_length = 0
16041604
; On windows, setting the entropy_length setting will activate the
16051605
; Windows random source (using the CryptoAPI)
16061606
;session.entropy_file = /dev/urandom
1607-
session.entropy_file =
16081607

16091608
; Set to {nocache,private,public,} to determine HTTP caching aspects
16101609
; or leave this empty to avoid sending anti-caching headers.

php.ini-production

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,6 @@
191191
; Development Value: "GPCS"
192192
; Production Value: "GPCS"
193193

194-
;windows.show_crt_warning
195-
; Default value: 0
196-
; Development value: 0
197-
; Production value: 0
198-
199194
;;;;;;;;;;;;;;;;;;;;
200195
; php.ini Options ;
201196
;;;;;;;;;;;;;;;;;;;;
@@ -642,6 +637,11 @@ html_errors = Off
642637
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
643638
;error_log = syslog
644639

640+
;windows.show_crt_warning
641+
; Default value: 0
642+
; Development value: 0
643+
; Production value: 0
644+
645645
;;;;;;;;;;;;;;;;;
646646
; Data Handling ;
647647
;;;;;;;;;;;;;;;;;
@@ -964,7 +964,7 @@ default_socket_timeout = 60
964964
;extension=php_mysql.dll
965965
;extension=php_mysqli.dll
966966
;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
967-
;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
967+
;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
968968
;extension=php_openssl.dll
969969
;extension=php_pdo_firebird.dll
970970
;extension=php_pdo_mssql.dll
@@ -1300,12 +1300,12 @@ mysqli.default_pw =
13001300
mysqli.reconnect = Off
13011301

13021302
[mysqlnd]
1303-
; Enable / Disable collection of general statstics by mysqlnd which can be
1303+
; Enable / Disable collection of general statistics by mysqlnd which can be
13041304
; used to tune and monitor MySQL operations.
13051305
; http://php.net/mysqlnd.collect_statistics
13061306
mysqlnd.collect_statistics = On
13071307

1308-
; Enable / Disable collection of memory usage statstics by mysqlnd which can be
1308+
; Enable / Disable collection of memory usage statistics by mysqlnd which can be
13091309
; used to tune and monitor MySQL operations.
13101310
; http://php.net/mysqlnd.collect_memory_statistics
13111311
mysqlnd.collect_memory_statistics = Off
@@ -1372,7 +1372,7 @@ mysqlnd.collect_memory_statistics = Off
13721372
; http://php.net/oci8.old-oci-close-semantics
13731373
;oci8.old_oci_close_semantics = Off
13741374

1375-
[PostgresSQL]
1375+
[PostgreSQL]
13761376
; Allow or prevent persistent links.
13771377
; http://php.net/pgsql.allow-persistent
13781378
pgsql.allow_persistent = On

0 commit comments

Comments
 (0)