cvs: php-src(PHP_5_1) /ext/pdo_firebird firebird_driver.c /ext/pdo_oci oci_driver.c

From: Date: Sun, 11 Sep 2005 01:42:41 +0000
Subject: cvs: php-src(PHP_5_1) /ext/pdo_firebird firebird_driver.c /ext/pdo_oci oci_driver.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-33890@lists.php.net to get a copy of this message
wez Sat Sep 10 21:42:41 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_oci oci_driver.c /php-src/ext/pdo_firebird firebird_driver.c Log: merge George's fixes back from HEAD http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.1&r2=1.24.2.2&ty=u Index: php-src/ext/pdo_oci/oci_driver.c diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.1 php-src/ext/pdo_oci/oci_driver.c:1.24.2.2 --- php-src/ext/pdo_oci/oci_driver.c:1.24.2.1 Sat Sep 10 17:38:07 2005 +++ php-src/ext/pdo_oci/oci_driver.c Sat Sep 10 21:42:38 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci_driver.c,v 1.24.2.1 2005/09/10 21:38:07 wez Exp $ */ +/* $Id: oci_driver.c,v 1.24.2.2 2005/09/11 01:42:38 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -431,7 +431,7 @@ { "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; http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/firebird_driver.c?r1=1.17&r2=1.17.2.1&ty=u Index: php-src/ext/pdo_firebird/firebird_driver.c diff -u php-src/ext/pdo_firebird/firebird_driver.c:1.17 php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.1 --- php-src/ext/pdo_firebird/firebird_driver.c:1.17 Wed Aug 3 10:07:39 2005 +++ php-src/ext/pdo_firebird/firebird_driver.c Sat Sep 10 21:42:41 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: firebird_driver.c,v 1.17 2005/08/03 14:07:39 sniper Exp $ */ +/* $Id: firebird_driver.c,v 1.17.2.1 2005/09/11 01:42:41 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -602,7 +602,7 @@ 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[] = {

« previous php.cvs (#33890) next »