diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:07:33 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:07:33 -0700 |
| commit | 50f15bb9219422a0a7e4d86cc03e5d10ed330d85 (patch) | |
| tree | 86406164e208b1329225db2cd9560ecf0b4362b7 /ext | |
| parent | 14b67ed6da932de92dc4e3a520a7a2cd8981dbe8 (diff) | |
| parent | 07ab23655a993fa8810def7ac9a5097058e1770f (diff) | |
| download | php-git-50f15bb9219422a0a7e4d86cc03e5d10ed330d85.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
add news for bug #65219
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index c54cd73d84..ff42514721 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; |