derick Thu Feb 12 18:39:47 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/simplexml simplexml.c
Log:
- Fixed start-up problem if both SPL and SimpleXML were enabled. The
double initialization of apache 1.3 was causing problems here.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1606&r2=1.1607&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1606 php-src/NEWS:1.1607
--- php-src/NEWS:1.1606 Thu Feb 12 11:26:58 2004
+++ php-src/NEWS Thu Feb 12 18:39:45 2004
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5 Release Candidate 1
+- Fixed start-up problem if both SPL and SimpleXML were enabled. The double
+ initialization of apache 1.3 was causing problems here. (Marcus, Derick)
12 Feb 2004, PHP 5 Beta 4
- Changed exceptions so that they must now inherit from the built-in Exception
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.129&r2=1.130&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.129 php-src/ext/simplexml/simplexml.c:1.130
--- php-src/ext/simplexml/simplexml.c:1.129 Thu Feb 12 05:43:23 2004
+++ php-src/ext/simplexml/simplexml.c Thu Feb 12 18:39:46 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.129 2004/02/12 10:43:23 zeev Exp $ */
+/* $Id: simplexml.c,v 1.130 2004/02/12 23:39:46 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1539,7 +1539,7 @@
"simplexml",
simplexml_functions,
PHP_MINIT(simplexml),
- NULL,
+ PHP_MSHUTDOWN(simplexml),
NULL,
NULL,
PHP_MINFO(simplexml),
@@ -1588,13 +1588,21 @@
}
/* }}} */
+/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml)
+ */
+PHP_MSHUTDOWN_FUNCTION(simplexml)
+{
+ sxe_class_entry = NULL;
+ return SUCCESS;
+}
+/* }}} */
/* {{{ PHP_MINFO_FUNCTION(simplexml)
*/
PHP_MINFO_FUNCTION(simplexml)
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.129 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.130 $");
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
