Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  make ext/odbc test credentials configurable
This commit is contained in:
Anatol Belski 2016-02-23 14:22:06 +01:00
commit cd75429ad8

View File

@ -3,6 +3,17 @@
putenv('ODBCINI=/etc/odbc.ini');
putenv('ODBCSYSINI=/etc');
$dsn = 'myodbc3';
$user = 'root';
$pass = '';
$dsn = getenv("ODBC_TEST_DSN");
$user = getenv("ODBC_TEST_USER");
$pass = getenv("ODBC_TEST_PASS");
if (false === $dsn) {
$dsn = 'myodbc3';
}
if (false === $user) {
$user = 'root';
}
if (false == $pass) {
$pass = '';
}