wez Sun Oct 23 00:10:22 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo pdo_dbh.c
Log:
Closes PECL Bug #5750; uri: dsn is not handled correctly.
Patch from [EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.11&r2=1.82.2.12&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.11 php-src/ext/pdo/pdo_dbh.c:1.82.2.12
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.11 Mon Oct 3 19:27:26 2005
+++ php-src/ext/pdo/pdo_dbh.c Sun Oct 23 00:10:20 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.11 2005/10/03 23:27:26 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.12 2005/10/23 04:10:20 wez Exp $ */
/* The PDO Database Handle Class */
@@ -252,7 +252,7 @@
if (!strncmp(data_source, "uri:", sizeof("uri:")-1)) {
/* the specified URI holds connection details */
- data_source = dsn_from_uri(data_source, alt_dsn,
sizeof(alt_dsn) TSRMLS_CC);
+ data_source = dsn_from_uri(data_source + sizeof("uri:")-1,
alt_dsn, sizeof(alt_dsn) TSRMLS_CC);
if (!data_source) {
zend_throw_exception_ex(php_pdo_get_exception(), 0
TSRMLS_CC, "invalid data source URI");
ZVAL_NULL(object);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php