diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 14:33:20 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-13 14:33:20 +0100 |
| commit | b2622ed8387dd0f98e2d2c559efec0cd54560bdd (patch) | |
| tree | f5be65da702b58f9289f25e74d98f3cf3d174be7 /php.ini-development | |
| parent | d660d6d31bdfa771fea4e2cacb9446ce6602bb61 (diff) | |
| parent | cab354debd953701ec1ecc066c0ef0690f8ed35c (diff) | |
| download | php-git-b2622ed8387dd0f98e2d2c559efec0cd54560bdd.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76088: ODBC functions are not available by default on Windows
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/php.ini-development b/php.ini-development index 83ed0fadbf..72ab5753b8 100644 --- a/php.ini-development +++ b/php.ini-development @@ -878,7 +878,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. @@ -897,6 +896,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 |