Fix buglet in dbh closing.

diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index d12459229d3a38398dee3d1f6ba497e37991ebb7..23660bc7937fc46f28dbb5bcc784d134fb1a1b77 100755 (executable)
--- 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 a9067d52f37fab3589d6fd7b2ad6c52d24e5c9e2..68ed51bf778da270fb2c816f7f17029abb6c85f9 100755 (executable)
--- 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();