abies Thu Aug 14 20:16:59 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
Moved TRMLS_FETCH to correct scope
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.141 php-src/ext/interbase/interbase.c:1.142
--- php-src/ext/interbase/interbase.c:1.141 Thu Aug 14 20:06:07 2003
+++ php-src/ext/interbase/interbase.c Thu Aug 14 20:16:58 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.141 2003/08/15 00:06:07 abies Exp $ */
+/* $Id: interbase.c,v 1.142 2003/08/15 00:16:58 abies Exp $ */
/*
Changes:
@@ -725,7 +725,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.141 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.142 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "Yes");
#endif
@@ -3935,6 +3935,9 @@
/* {{{ _php_ibase_callback() */
static isc_callback _php_ibase_callback(ibase_event *event, unsigned short
buffer_size, char *result_buf)
{
+ /* this function is called asynchronously by the Interbase client library. */
+ TSRMLS_FETCH_FROM_CTX(event->thread_ctx);
+
/**
* The callback function is called when the event is first registered and when
the event
* is cancelled. I consider this is a bug. By clearing event->callback, we
make sure
@@ -3946,9 +3949,6 @@
ISC_STATUS occurred_event[15];
zval event_name, link_id, return_value, *args[2] = { &event_name,
&link_id };
- /* this function is called asynchronously by the Interbase client
library. */
- TSRMLS_FETCH_FROM_CTX(event->thread_ctx);
-
/* copy the updated results into the result buffer */
memcpy(event->result_buffer, result_buf, buffer_size);
@@ -4086,6 +4086,7 @@
efree(args);
ZEND_REGISTER_RESOURCE(return_value, event, le_event);
+ zend_list_addref(Z_LVAL_P(return_value));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
