mirror of
https://github.com/php/php-src.git
synced 2024-11-24 02:15:04 +08:00
merge George's fixes back from HEAD
This commit is contained in:
parent
f4007c8f6b
commit
e53f6428ac
@ -602,7 +602,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRM
|
||||
int i, ret = 0;
|
||||
pdo_firebird_db_handle *H = dbh->driver_data = pecalloc(1,sizeof(*H),dbh->is_persistent);
|
||||
|
||||
php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 2);
|
||||
php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 3);
|
||||
|
||||
do {
|
||||
static char const dpb_flags[] = {
|
||||
|
@ -431,7 +431,7 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC
|
||||
{ "dbname", "", 0 }
|
||||
};
|
||||
|
||||
php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 4);
|
||||
php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 2);
|
||||
|
||||
H = pecalloc(1, sizeof(*H), dbh->is_persistent);
|
||||
dbh->driver_data = H;
|
||||
|
Loading…
Reference in New Issue
Block a user