summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2018-03-13 14:16:20 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2018-03-13 14:30:43 +0100
commitcab354debd953701ec1ecc066c0ef0690f8ed35c (patch)
tree1cee265ccda2e5e9f6fb00dd82d07d7ba13c88ba
parent0643c7ab4d28fc489802bb03f325964c5f8e13d3 (diff)
downloadphp-git-cab354debd953701ec1ecc066c0ef0690f8ed35c.tar.gz
Fix #76088: ODBC functions are not available by default on Windows
-rw-r--r--NEWS4
-rw-r--r--php.ini-development2
-rw-r--r--php.ini-production2
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 3bd178d419..f99252fb77 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ PHP NEWS
- GD:
. Fixed bug #73957 (signed integer conversion in imagescale()). (cmb)
+- ODBC:
+ . Fixed bug #76088 (ODBC functions are not available by default on Windows).
+ (cmb)
+
- Opcache:
. Fixed bug #76074 (opcache corrupts variable in for-loop). (Bob)
diff --git a/php.ini-development b/php.ini-development
index e371ca5bc1..3d4a905f9a 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -884,7 +884,6 @@ default_socket_timeout = 60
; default extension directory.
;
; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
; extension folders as well as the separate PECL DLL download (PHP 5+).
; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_mysqli.dll
;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll
diff --git a/php.ini-production b/php.ini-production
index 0a28d3b6f2..1febc0144f 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -884,7 +884,6 @@ default_socket_timeout = 60
; default extension directory.
;
; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
; extension folders as well as the separate PECL DLL download (PHP 5+).
; Be sure to appropriately set the extension_dir directive.
@@ -904,6 +903,7 @@ default_socket_timeout = 60
;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_mysqli.dll
;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
+;extension=php_odbc.dll
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll