diff options
| author | Wez Furlong <wez@php.net> | 2004-05-22 15:04:26 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-05-22 15:04:26 +0000 |
| commit | d39117c2347c2d0f559289c8926d4c27835e093b (patch) | |
| tree | 2ff9b7e0a1376cf513ce8cbd379c4250c2e80d82 /ext | |
| parent | 35494bb569aa83c26550a8863f681d0fd641940c (diff) | |
| download | php-git-d39117c2347c2d0f559289c8926d4c27835e093b.tar.gz | |
Fix buglet in dbh closing.
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/pdo_odbc/odbc_driver.c | 4 | ||||
| -rwxr-xr-x | ext/pdo_odbc/pdo_odbc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index d12459229d..23660bc793 100755 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -146,9 +146,9 @@ static int odbc_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) if (H->dbc != SQL_NULL_HANDLE) { SQLEndTran(SQL_HANDLE_DBC, H->dbc, SQL_ROLLBACK); + SQLDisconnect(H->dbc); + SQLFreeHandle(SQL_HANDLE_DBC, H->dbc); } - - SQLFreeHandle(SQL_HANDLE_DBC, H->dbc); SQLFreeHandle(SQL_HANDLE_ENV, H->env); pefree(H, dbh->is_persistent); diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index a9067d52f3..68ed51bf77 100755 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -132,6 +132,8 @@ PHP_MINFO_FUNCTION(pdo_odbc) #ifdef SQL_ATTR_CONNECTION_POOLING php_info_print_table_row(2, "ODBC Connection Pooling", pdo_odbc_pool_on == SQL_CP_OFF ? "Disabled" : (pdo_odbc_pool_mode == SQL_CP_STRICT_MATCH ? "Enabled, strict matching" : "Enabled, relaxed matching")); +#else + php_info_print_table_row(2, "ODBC Connection Pooling", "Not supported in this build"); #endif php_info_print_table_end(); |