diff options
author | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:31:20 +0000 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:31:20 +0000 |
commit | 70141093a731049ee9220e9e965f61ded56ed4d5 (patch) | |
tree | 6e67b382253a186889bfdc37c31062d6fb9880d9 /ext/xml/xml.c | |
parent | e453af3851daf08f5af9b45fc7819c3a9c336f1e (diff) | |
parent | 97294aca7e066443291cc2d77f8674ac23eabb32 (diff) | |
download | php-git-70141093a731049ee9220e9e965f61ded56ed4d5.tar.gz |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'ext/xml/xml.c')
-rw-r--r-- | ext/xml/xml.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 21d5233126..b832732f0d 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1183,9 +1183,7 @@ PHP_FUNCTION(xml_set_object) } /* please leave this commented - or ask thies@thieso.net before doing it (again) */ -/* #ifdef ZEND_ENGINE_2 - zval_add_ref(&parser->object); -#endif */ + /* zval_add_ref(&parser->object); */ ZVAL_COPY(&parser->object, mythis); |