merge George's fixes back from HEAD

diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index f47e6f31ec9608856f746ee2d4af39a63d604241..d040c2614ba33cbf98e5ef2cd3493135dff0b60d 100644 (file)
--- a/ext/pdo_firebird/firebird_driver.c
+++ b/ext/pdo_firebird/firebird_driver.c
@@ -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[] = { 

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index d3824d360c7c5818d6df45f65aa16278bd696d6e..08177fb7d4c514878a62bb24cea356ef1c975ef0 100755 (executable)
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -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;