summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2011-11-29 22:33:55 +0000
committerChristopher Jones <sixd@php.net>2011-11-29 22:33:55 +0000
commitd9e955c6b2156f771ca3442d89d7b4c01653475c (patch)
tree2add17feb30cb8e6779809f55dd4f638975e5ce9 /php.ini-development
parenta2ac3a6f26cf554141301c64adf72fd1acb107ae (diff)
downloadphp-git-d9e955c6b2156f771ca3442d89d7b4c01653475c.tar.gz
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
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development12
1 files changed, 6 insertions, 6 deletions
diff --git a/php.ini-development b/php.ini-development
index fb3b1cace2..bd3eefcfff 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -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 @@ html_errors = On
; 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 @@ default_socket_timeout = 60
;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