From: Ilia Alshanetsky Date: Thu, 8 Oct 2009 02:21:36 +0000 (+0000) Subject: Revert fix, not relavent for this branch X-Git-Tag: php-5.2.12RC1~80 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9b8139e65c0fbbe6647937e351b6919e43aed76;p=php Revert fix, not relavent for this branch --- diff --git a/NEWS b/NEWS index 11e5e74974..b715f3c624 100644 --- a/NEWS +++ b/NEWS @@ -6,8 +6,6 @@ PHP NEWS - Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz Stachowiak. (Rasmus) -- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning). - (Ilia, wmeler at wp-sa dot pl) - Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded applications). (Ilia, Florian Anderiasch) - Fixed bug #49738 (calling mcrypt() after mcrypt_generic_deinit() crashes). diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 20dff1e7ac..b7be14f713 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -2412,8 +2412,6 @@ PHP_MINIT_FUNCTION(simplexml) sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC); sxe_class_entry->get_iterator = php_sxe_get_iterator; sxe_class_entry->iterator_funcs.funcs = &php_sxe_iterator_funcs; - sxe_class_entry->serialize = zend_class_serialize_deny; - sxe_class_entry->unserialize = zend_class_unserialize_deny; zend_class_implements(sxe_class_entry TSRMLS_CC, 1, zend_ce_traversable); sxe_object_handlers.get_method = zend_get_std_object_handlers()->get_method; sxe_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor;