mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
destroy regular connections in RSHUTDOWN if ZTS is used
this fixes problem with Oracle9 (not Oracle10) and Apache2/worker - connections are not being closed correctly see #35205 and similar issues
This commit is contained in:
parent
2ca31fa63c
commit
9bd3c360ba
@ -88,6 +88,7 @@ static void php_oci_descriptor_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
|
||||
static void php_oci_collection_list_dtor (zend_rsrc_list_entry * TSRMLS_DC);
|
||||
|
||||
static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC);
|
||||
static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC);
|
||||
static int php_oci_connection_ping(php_oci_connection * TSRMLS_DC);
|
||||
static int php_oci_connection_status(php_oci_connection * TSRMLS_DC);
|
||||
static int php_oci_connection_close(php_oci_connection * TSRMLS_DC);
|
||||
@ -623,6 +624,7 @@ PHP_RSHUTDOWN_FUNCTION(oci)
|
||||
zend_hash_apply(&EG(persistent_list), (apply_func_t) php_oci_persistent_helper TSRMLS_CC);
|
||||
|
||||
#ifdef ZTS
|
||||
zend_hash_apply(&EG(regular_list), (apply_func_t) php_oci_regular_helper TSRMLS_CC);
|
||||
php_oci_cleanup_global_handles(TSRMLS_C);
|
||||
#endif
|
||||
|
||||
@ -1726,4 +1728,19 @@ static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
|
||||
return 0;
|
||||
} /* }}} */
|
||||
|
||||
/* {{{ php_oci_regular_helper()
|
||||
Helper function to close non-persistent connections at the end of request in ZTS mode */
|
||||
static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC)
|
||||
{
|
||||
php_oci_connection *connection;
|
||||
|
||||
if (le->type == le_connection) {
|
||||
connection = (php_oci_connection *)le->ptr;
|
||||
if (connection) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
} /* }}} */
|
||||
|
||||
#endif /* HAVE_OCI8 */
|
||||
|
Loading…
Reference in New Issue
Block a user