mirror of
https://github.com/php/php-src.git
synced 2025-01-26 13:44:22 +08:00
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: make ext/odbc test credentials configurable
This commit is contained in:
commit
cd75429ad8
@ -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 = '';
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user