com php-src: Fixed resources apply_dtor: ext/pgsql/pgsql .c main/streams/streams.c
| From: | Xinchen Hui | Date: | Mon, 19 May 2014 06:53:02 +0000 |
| Subject: | com php-src: Fixed resources apply_dtor: ext/pgsql/pgsql .c main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78461@lists.php.net to get a copy of this message | ||
Commit: 98f801ccbc23206a76892440822fb75448d0921e
Author: Xinchen Hui <laruence@php.net> Mon, 19 May 2014 14:53:02 +0800
Parents: 09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98f801ccbc23206a76892440822fb75448d0921e
Log:
Fixed resources apply_dtor
Changed paths:
M ext/pgsql/pgsql.c
M main/streams/streams.c
Diff:
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index f215993..be1f31c 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -989,11 +989,12 @@ static void _php_pgsql_notice_ptr_dtor(zval *el)
/* {{{ _rollback_transactions
*/
-static int _rollback_transactions(zend_resource *rsrc TSRMLS_DC)
+static int _rollback_transactions(zval *el TSRMLS_DC)
{
PGconn *link;
PGresult *res;
int orig;
+ zend_resource *rsrc = Z_RES_P(el);
if (rsrc->type != le_plink)
return 0;
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 0889bd5..c754bdc 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -74,9 +74,10 @@ static int _php_stream_release_context(zval *zv, void *pContext TSRMLS_DC)
return 0;
}
-static int forget_persistent_resource_id_numbers(zend_resource *rsrc TSRMLS_DC)
+static int forget_persistent_resource_id_numbers(zval *el TSRMLS_DC)
{
php_stream *stream;
+ zend_resource *rsrc = Z_RES_P(el);
if (rsrc->type != le_pstream) {
return 0;