From: Wez Furlong <wez@php.net>
Date: Sun, 11 Sep 2005 01:42:41 +0000 (+0000)
Subject: merge George's fixes back from HEAD
X-Git-Tag: RELEASE_1_0RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e53f6428ac1181a8acb217bde23997c0c0edbbb9;p=php

merge George's fixes back from HEAD
---

diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index f47e6f31ec..d040c2614b 100644
--- 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 d3824d360c..08177fb7d4 100755
--- 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;