From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 13 Mar 2018 13:33:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.5RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2622ed8387dd0f98e2d2c559efec0cd54560bdd;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76088: ODBC functions are not available by default on Windows
---

b2622ed8387dd0f98e2d2c559efec0cd54560bdd
diff --cc NEWS
index 3dc8329992,f99252fb77..85bdec447b
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,6 +1,13 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.16
 +?? ??? 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
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).
diff --cc php.ini-development
index 83ed0fadbf,3d4a905f9a..72ab5753b8
--- a/php.ini-development
+++ b/php.ini-development
@@@ -860,52 -866,53 +860,52 @@@ default_socket_timeout = 6
  ; If you wish to have an extension loaded automatically, use the following
  ; syntax:
  ;
 -;   extension=modulename.extension
 -;
 -; For example, on Windows:
 +;   extension=modulename
  ;
 -;   extension=msql.dll
 +; For example:
  ;
 -; ... or under UNIX:
 +;   extension=mysqli
 +; 
 +; When the extension library to load is not located in the default extension
 +; directory, You may specify an absolute path to the library file:
  ;
 -;   extension=msql.so
 +;   extension=/path/to/extension/mysqli.so
  ;
 -; ... or with a path:
 +; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
 +; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
 +; deprecated in a future PHP major version. So, when it is possible, please
 +; move to the new ('extension=<ext>) syntax.
  ;
 -;   extension=/path/to/extension/msql.so
 +; Notes for Windows environments :
  ;
- ; - ODBC support is built in, so no dll is needed for it.
 -; If you only provide the name of the extension, PHP will look for it in its
 -; default extension directory.
 +; - 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.
  ;
 -; Windows Extensions
 -; 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.
 -;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
 -;extension=php_ftp.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_gmp.dll
 -;extension=php_intl.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;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
 -;extension=php_pdo_oci.dll
 -;extension=php_pdo_odbc.dll
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
 -;extension=php_shmop.dll
 +;extension=bz2
 +;extension=curl
 +;extension=fileinfo
 +;extension=gd2
 +;extension=gettext
 +;extension=gmp
 +;extension=intl
 +;extension=imap
 +;extension=interbase
 +;extension=ldap
 +;extension=mbstring
 +;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
 +;extension=pdo_oci
 +;extension=pdo_odbc
 +;extension=pdo_pgsql
 +;extension=pdo_sqlite
 +;extension=pgsql
 +;extension=shmop
  
  ; The MIBS data available in the PHP distribution must be installed.
  ; See http://www.php.net/manual/en/snmp.installation.php
diff --cc php.ini-production
index a8fb5c9386,1febc0144f..491e92fa57
--- a/php.ini-production
+++ b/php.ini-production
@@@ -867,52 -866,53 +867,52 @@@ default_socket_timeout = 6
  ; If you wish to have an extension loaded automatically, use the following
  ; syntax:
  ;
 -;   extension=modulename.extension
 -;
 -; For example, on Windows:
 +;   extension=modulename
  ;
 -;   extension=msql.dll
 +; For example:
  ;
 -; ... or under UNIX:
 +;   extension=mysqli
 +; 
 +; When the extension library to load is not located in the default extension
 +; directory, You may specify an absolute path to the library file:
  ;
 -;   extension=msql.so
 +;   extension=/path/to/extension/mysqli.so
  ;
 -; ... or with a path:
 +; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
 +; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
 +; deprecated in a future PHP major version. So, when it is possible, please
 +; move to the new ('extension=<ext>) syntax.
  ;
 -;   extension=/path/to/extension/msql.so
 +; Notes for Windows environments :
  ;
- ; - ODBC support is built in, so no dll is needed for it.
 -; If you only provide the name of the extension, PHP will look for it in its
 -; default extension directory.
 +; - 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.
  ;
 -; Windows Extensions
 -; 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.
 -;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
 -;extension=php_ftp.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_gmp.dll
 -;extension=php_intl.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;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
 -;extension=php_pdo_oci.dll
 -;extension=php_pdo_odbc.dll
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
 -;extension=php_shmop.dll
 +;extension=bz2
 +;extension=curl
 +;extension=fileinfo
 +;extension=gd2
 +;extension=gettext
 +;extension=gmp
 +;extension=intl
 +;extension=imap
 +;extension=interbase
 +;extension=ldap
 +;extension=mbstring
 +;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
 +;extension=pdo_oci
 +;extension=pdo_odbc
 +;extension=pdo_pgsql
 +;extension=pdo_sqlite
 +;extension=pgsql
 +;extension=shmop
  
  ; The MIBS data available in the PHP distribution must be installed.
  ; See http://www.php.net/manual/en/snmp.installation.php