com php-src: Fix Bug #63171 Script hangs after max_e xecution_time: ext/odbc/php_odbc.c

From: Date: Thu, 17 Mar 2016 12:38:45 +0000
Subject: com php-src: Fix Bug #63171 Script hangs after max_e xecution_time: ext/odbc/php_odbc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91390@lists.php.net to get a copy of this message
Commit: 407ad28ae5bbdf1c9e4c3ae8fa40a3ec6aeaf34e Author: Remi Collet <remi@php.net> Thu, 17 Mar 2016 13:38:45 +0100 Parents: 6d4aec029a06140eac8f57e8b3daa06aee43e145 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=407ad28ae5bbdf1c9e4c3ae8fa40a3ec6aeaf34e Log: Fix Bug #63171 Script hangs after max_execution_time If aborted via timer expiration, don't try to call any unixODBC function which may hangs because of internal locks Bugs: https://bugs.php.net/63171 Changed paths: M ext/odbc/php_odbc.c Diff: diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index bde6c1e..0cd7135 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -431,7 +431,8 @@ static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) efree(res->values); res->values = NULL; } - if (res->stmt) { + /* If aborted via timer expiration, don't try to call any unixODBC function */ + if (res->stmt && !(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) SQLTransact(res->conn_ptr->henv, res->conn_ptr->hdbc, (SQLUSMALLINT) SQL_COMMIT); @@ -487,9 +488,12 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC) } } - safe_odbc_disconnect(conn->hdbc); - SQLFreeConnect(conn->hdbc); - SQLFreeEnv(conn->henv); + /* If aborted via timer expiration, don't try to call any unixODBC function */ + if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { + safe_odbc_disconnect(conn->hdbc); + SQLFreeConnect(conn->hdbc); + SQLFreeEnv(conn->henv); + } efree(conn); ODBCG(num_links)--; } @@ -515,9 +519,12 @@ static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC) } } - safe_odbc_disconnect(conn->hdbc); - SQLFreeConnect(conn->hdbc); - SQLFreeEnv(conn->henv); + /* If aborted via timer expiration, don't try to call any unixODBC function */ + if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { + safe_odbc_disconnect(conn->hdbc); + SQLFreeConnect(conn->hdbc); + SQLFreeEnv(conn->henv); + } free(conn); ODBCG(num_links)--;

« previous php.cvs (#91390) next »