diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-19 14:53:02 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-19 14:53:02 +0800 |
| commit | 98f801ccbc23206a76892440822fb75448d0921e (patch) | |
| tree | c5f8492901f93048c4d77f74a79f7f19001ef828 | |
| parent | 09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c (diff) | |
| download | php-git-98f801ccbc23206a76892440822fb75448d0921e.tar.gz | |
Fixed resources apply_dtor
| -rw-r--r-- | ext/pgsql/pgsql.c | 3 | ||||
| -rw-r--r-- | main/streams/streams.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index f215993bf6..be1f31cc6f 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 0889bd57a7..c754bdc58c 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; |