iliaa                                    Thu, 08 Oct 2009 02:21:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289327

Log:
Revert fix, not relavent for this branch

Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/simplexml/simplexml.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-08 02:21:09 UTC (rev 289326)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-08 02:21:36 UTC (rev 289327)
@@ -6,8 +6,6 @@
 - 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).

Modified: php/php-src/branches/PHP_5_2/ext/simplexml/simplexml.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/simplexml/simplexml.c      2009-10-08 
02:21:09 UTC (rev 289326)
+++ php/php-src/branches/PHP_5_2/ext/simplexml/simplexml.c      2009-10-08 
02:21:36 UTC (rev 289327)
@@ -2412,8 +2412,6 @@
        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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to