iliaa Tue Dec 16 12:14:07 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/xml xml.c
/php-src/ext/dom php_dom.c
Log:
Removed duplicate php_libxml_(init|shutdown) they are already done by
ext/libxml.
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.91 php-src/ext/simplexml/simplexml.c:1.92
--- php-src/ext/simplexml/simplexml.c:1.91 Tue Dec 9 11:29:51 2003
+++ php-src/ext/simplexml/simplexml.c Tue Dec 16 12:14:05 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.91 2003/12/09 16:29:51 sniper Exp $ */
+/* $Id: simplexml.c,v 1.92 2003/12/16 17:14:05 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1533,8 +1533,6 @@
sxe_object_handlers.get_class_entry =
zend_get_std_object_handlers()->get_class_entry;
sxe_object_handlers.get_class_name =
zend_get_std_object_handlers()->get_class_name;
- php_libxml_initialize();
-
return SUCCESS;
}
/* }}} */
@@ -1543,8 +1541,6 @@
*/
PHP_MSHUTDOWN_FUNCTION(simplexml)
{
- php_libxml_shutdown();
-
return SUCCESS;
}
/* }}} */
@@ -1571,7 +1567,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.92 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.143 php-src/ext/xml/xml.c:1.144
--- php-src/ext/xml/xml.c:1.143 Mon Dec 8 02:15:32 2003
+++ php-src/ext/xml/xml.c Tue Dec 16 12:14:05 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.143 2003/12/08 07:15:32 moriyoshi Exp $ */
+/* $Id: xml.c,v 1.144 2003/12/16 17:14:05 iliaa Exp $ */
#define IS_EXT_MODULE
@@ -247,10 +247,7 @@
#else
REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "expat", CONST_CS|CONST_PERSISTENT);
#endif
-
-#ifdef LIBXML_EXPAT_COMPAT
- php_libxml_initialize();
-#endif
+
return SUCCESS;
}
@@ -263,9 +260,6 @@
PHP_MSHUTDOWN_FUNCTION(xml)
{
-#ifdef LIBXML_EXPAT_COMPAT
- php_libxml_shutdown();
-#endif
return SUCCESS;
}
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.44 php-src/ext/dom/php_dom.c:1.45
--- php-src/ext/dom/php_dom.c:1.44 Mon Dec 8 12:08:10 2003
+++ php-src/ext/dom/php_dom.c Tue Dec 16 12:14:06 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.44 2003/12/08 17:08:10 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.45 2003/12/16 17:14:06 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -631,8 +631,6 @@
REGISTER_LONG_CONSTANT("DOM_INVALID_ACCESS_ERR", INVALID_ACCESS_ERR,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("DOM_VALIDATION_ERR", VALIDATION_ERR,
CONST_CS | CONST_PERSISTENT);
- php_libxml_initialize();
-
return SUCCESS;
}
/* }}} */
@@ -663,8 +661,6 @@
PHP_MSHUTDOWN_FUNCTION(dom)
{
- php_libxml_shutdown();
-
zend_hash_destroy(&dom_domstringlist_prop_handlers);
zend_hash_destroy(&dom_namelist_prop_handlers);
zend_hash_destroy(&dom_domimplementationlist_prop_handlers);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
