summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2018-03-13 14:34:26 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2018-03-13 14:34:26 +0100
commit62329ef5f08f4d05959f5e3dde53de1a227455b8 (patch)
tree8eed5fe2058e82b66cb3447f12fd119a1117f123 /php.ini-development
parent1210df60168c74cb8347c45e5762210dce484496 (diff)
parentb2622ed8387dd0f98e2d2c559efec0cd54560bdd (diff)
downloadphp-git-62329ef5f08f4d05959f5e3dde53de1a227455b8.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Fix #76088: ODBC functions are not available by default on Windows
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development2
1 files changed, 1 insertions, 1 deletions
diff --git a/php.ini-development b/php.ini-development
index 9bc1095dce..ab9ec31078 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -877,7 +877,6 @@ default_socket_timeout = 60
;
; Notes for Windows environments :
;
-; - ODBC support is built in, so no dll is needed for it.
; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
; extension folders as well as the separate PECL DLL download (PHP 5+).
; Be sure to appropriately set the extension_dir directive.
@@ -896,6 +895,7 @@ default_socket_timeout = 60
;extension=exif ; Must be after mbstring as it depends on it
;extension=mysqli
;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
+;extension=odbc
;extension=openssl
;extension=pdo_firebird
;extension=pdo_mysql