Can I merge to 5.3? (without this patch all I get are segfaults..)
-Hannes On Wed, Jun 10, 2009 at 16:28, Hannes Magnusson<bj...@php.net> wrote: > bjori Wed Jun 10 14:28:06 2009 UTC > > Modified files: > /php-src/ext/simplexml simplexml.c > Log: > Fix extension loading order > > > > http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.276&r2=1.277&diff_format=u > Index: php-src/ext/simplexml/simplexml.c > diff -u php-src/ext/simplexml/simplexml.c:1.276 > php-src/ext/simplexml/simplexml.c:1.277 > --- php-src/ext/simplexml/simplexml.c:1.276 Mon May 25 14:32:14 2009 > +++ php-src/ext/simplexml/simplexml.c Wed Jun 10 14:28:06 2009 > @@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: simplexml.c,v 1.276 2009/05/25 14:32:14 felipe Exp $ */ > +/* $Id: simplexml.c,v 1.277 2009/06/10 14:28:06 bjori Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" > @@ -2532,6 +2532,7 @@ > > static const zend_module_dep simplexml_deps[] = { /* {{{ */ > ZEND_MOD_REQUIRED("libxml") > + ZEND_MOD_REQUIRED("spl") > {NULL, NULL, NULL} > }; > /* }}} */ > @@ -2616,7 +2617,7 @@ > { > php_info_print_table_start(); > php_info_print_table_header(2, "Simplexml support", "enabled"); > - php_info_print_table_row(2, "Revision", "$Revision: 1.276 $"); > + php_info_print_table_row(2, "Revision", "$Revision: 1.277 $"); > php_info_print_table_row(2, "Schema support", > #ifdef LIBXML_SCHEMAS_ENABLED > "enabled"); > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
