com php-src: Fix weakref object handlers for master: Zend/zend_weakrefs.c

From: Date: Thu, 14 Mar 2019 16:33:17 +0000
Subject: com php-src: Fix weakref object handlers for master: Zend/zend_weakrefs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105145@lists.php.net to get a copy of this message
Commit: 273aa37b8396f4e57791df979dcba899b1328e70 Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 14 Mar 2019 17:33:17 +0100 Parents: 2e69f59657623819ff253ad1e3e22f9a20ea9ac3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=273aa37b8396f4e57791df979dcba899b1328e70 Log: Fix weakref object handlers for master Changed paths: M Zend/zend_weakrefs.c Diff: diff --git a/Zend/zend_weakrefs.c b/Zend/zend_weakrefs.c index b4eaf43..f9918d1 100644 --- a/Zend/zend_weakrefs.c +++ b/Zend/zend_weakrefs.c @@ -112,13 +112,13 @@ static void zend_weakref_free(zend_object *zo) { #define zend_weakref_unsupported(thing) \ zend_throw_error(NULL, "WeakReference objects do not support " thing); -static zval* zend_weakref_no_write(zval *object, zval *member, zval *value, void **rtc) { +static zval* zend_weakref_no_write(zend_object *object, zend_string *member, zval *value, void **rtc) { zend_weakref_unsupported("properties"); return &EG(uninitialized_zval); } -static zval* zend_weakref_no_read(zval *object, zval *member, int type, void **rtc, zval *rv) { +static zval* zend_weakref_no_read(zend_object *object, zend_string *member, int type, void **rtc, zval *rv) { if (!EG(exception)) { zend_weakref_unsupported("properties"); } @@ -126,19 +126,19 @@ static zval* zend_weakref_no_read(zval *object, zval *member, int type, void **r return &EG(uninitialized_zval); } -static zval *zend_weakref_no_read_ptr(zval *object, zval *member, int type, void **rtc) { +static zval *zend_weakref_no_read_ptr(zend_object *object, zend_string *member, int type, void **rtc) { zend_weakref_unsupported("property references"); return NULL; } -static int zend_weakref_no_isset(zval *object, zval *member, int hse, void **rtc) { +static int zend_weakref_no_isset(zend_object *object, zend_string *member, int hse, void **rtc) { if (hse != 2) { zend_weakref_unsupported("properties"); } return 0; } -static void zend_weakref_no_unset(zval *object, zval *member, void **rtc) { +static void zend_weakref_no_unset(zend_object *object, zend_string *member, void **rtc) { zend_weakref_unsupported("properties"); }

« previous php.cvs (#105145) next »