com php-src: Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record: ext/pdo_dblib/dblib_driver.c
| From: | Stanley Sufficool | Date: | Sun, 14 Jul 2013 18:16:42 +0000 |
| Subject: | com php-src: Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record: ext/pdo_dblib/dblib_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72635@lists.php.net to get a copy of this message | ||
Commit: d012bdca0319e225435430f89446828642b9810d
Author: Stanley Sufficool <ssufficool@php.net> Sun, 14 Jul 2013 11:16:42 -0700
Parents: ebad5178c4ae0da124469b1432fb0e890f6147da
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d012bdca0319e225435430f89446828642b9810d
Log:
Fix Bug #65219
DBSETLDBNAME should be called before login to set DBNAME in login record
Bugs:
https://bugs.php.net/65219
Changed paths:
M ext/pdo_dblib/dblib_driver.c
Diff:
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index c54cd73..ff42514 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -350,6 +350,12 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options
TSRMLS_
DBSETLAPP(H->login, vars[1].optval);
+#ifdef DBSETLDBNAME
+ if (vars[3].optval) {
+ DBSETLDBNAME(H->login, vars[3].optval);
+ }
+#endif
+
H->link = dbopen(H->login, vars[2].optval);
if (!H->link) {
@@ -365,12 +371,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options
TSRMLS_
/* allow double quoted indentifiers */
DBSETOPT(H->link, DBQUOTEDIDENT, "1");
-#ifdef DBSETLDBNAME
- if (vars[3].optval) {
- DBSETLDBNAME(H->login, vars[3].optval);
- }
-#endif
-
ret = 1;
dbh->max_escaped_char_length = 2;
dbh->alloc_own_columns = 1;