php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  Fix #76088: ODBC functions are not available by default on Windows
This commit is contained in:
Christoph M. Becker
2018-03-13 14:33:20 +01:00
parent d660d6d31b cab354debd
commit b2622ed838
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+3
View File
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2018, PHP 7.2.5
- ODBC:
. Fixed bug #76088 (ODBC functions are not available by default on Windows).
(cmb)
29 Mar 2018, PHP 7.2.4
php.ini-development
+1 -1
View File
@@ -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
php.ini-production
+1 -1
View File
@@ -885,7 +885,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.
@@ -904,6 +903,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