Fix #76088: ODBC functions are not available by default on Windows

This commit is contained in:
Christoph M. Becker 2018-03-13 14:16:20 +01:00
parent 0643c7ab4d
commit cab354debd
3 changed files with 6 additions and 2 deletions

4
NEWS
View File

@ -11,6 +11,10 @@ PHP NEWS
- GD: - GD:
. Fixed bug #73957 (signed integer conversion in imagescale()). (cmb) . Fixed bug #73957 (signed integer conversion in imagescale()). (cmb)
- ODBC:
. Fixed bug #76088 (ODBC functions are not available by default on Windows).
(cmb)
- Opcache: - Opcache:
. Fixed bug #76074 (opcache corrupts variable in for-loop). (Bob) . Fixed bug #76074 (opcache corrupts variable in for-loop). (Bob)

View File

@ -884,7 +884,6 @@ default_socket_timeout = 60
; default extension directory. ; default extension directory.
; ;
; Windows Extensions ; 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+) ; 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+). ; extension folders as well as the separate PECL DLL download (PHP 5+).
; Be sure to appropriately set the extension_dir directive. ; 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_exif.dll ; Must be after mbstring as it depends on it
;extension=php_mysqli.dll ;extension=php_mysqli.dll
;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client ;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
;extension=php_odbc.dll
;extension=php_openssl.dll ;extension=php_openssl.dll
;extension=php_pdo_firebird.dll ;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll ;extension=php_pdo_mysql.dll

View File

@ -884,7 +884,6 @@ default_socket_timeout = 60
; default extension directory. ; default extension directory.
; ;
; Windows Extensions ; 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+) ; 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+). ; extension folders as well as the separate PECL DLL download (PHP 5+).
; Be sure to appropriately set the extension_dir directive. ; 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_exif.dll ; Must be after mbstring as it depends on it
;extension=php_mysqli.dll ;extension=php_mysqli.dll
;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client ;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
;extension=php_odbc.dll
;extension=php_openssl.dll ;extension=php_openssl.dll
;extension=php_pdo_firebird.dll ;extension=php_pdo_firebird.dll
;extension=php_pdo_mysql.dll ;extension=php_pdo_mysql.dll