[PHP-CVS] cvs: php-src(PHP_5_1) /ext/oci8 oci8.c

[Antony Dovgal]

tony2001                Tue Jan 10 08:34:28 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/oci8   oci8.c 
  Log:
  MFH: 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
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.7&r2=1.269.2.8&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.7 php-src/ext/oci8/oci8.c:1.269.2.8
--- php-src/ext/oci8/oci8.c:1.269.2.7   Thu Jan  5 13:42:35 2006
+++ php-src/ext/oci8/oci8.c     Tue Jan 10 08:34:28 2006
@@ -26,7 +26,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8.c,v 1.269.2.7 2006/01/05 13:42:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.8 2006/01/10 08:34:28 tony2001 Exp $ */
 /* TODO
  *
  * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() 
with OCI_ATTR_LOBEMPTY
@@ -88,6 +88,9 @@
 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);
+#ifdef ZTS
+static int php_oci_regular_helper(zend_rsrc_list_entry *le TSRMLS_DC);
+#endif
 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 +626,7 @@
        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
 
@@ -635,7 +639,7 @@
 
        php_info_print_table_start();
        php_info_print_table_row(2, "OCI8 Support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.7 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.8 $");
 
        sprintf(buf, "%ld", OCI_G(num_persistent));
        php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1726,4 +1730,21 @@
        return 0;
 } /* }}} */
 
+#ifdef ZTS
+/* {{{ 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
+
 #endif /* HAVE_OCI8 */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php