rrichards Wed Jun 22 15:58:33 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/dom xml_common.h php_dom.c dom_ce.h
Log:
MFH: Fix bug #33299 (php:function no longer handles returned dom objects)
- maybe fix #33431/33432
http://cvs.php.net/diff.php/php-src/ext/dom/xml_common.h?r1=1.19&r2=1.19.2.1&ty=u
Index: php-src/ext/dom/xml_common.h
diff -u php-src/ext/dom/xml_common.h:1.19 php-src/ext/dom/xml_common.h:1.19.2.1
--- php-src/ext/dom/xml_common.h:1.19 Thu Jan 8 12:32:03 2004
+++ php-src/ext/dom/xml_common.h Wed Jun 22 15:58:33 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml_common.h,v 1.19 2004/01/08 17:32:03 sniper Exp $ */
+/* $Id: xml_common.h,v 1.19.2.1 2005/06/22 19:58:33 rrichards Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -54,12 +54,12 @@
#endif /* DOM_EXPORTS */
#endif /* PHP_WIN32 */
-#define PHP_DOM_EXPORT(__type) PHPAPI __type
+#define PHP_DOM_EXPORT PHPAPI
-PHP_DOM_EXPORT(zend_class_entry *) dom_node_class_entry;
-PHP_DOM_EXPORT(dom_object *) php_dom_object_get_data(xmlNodePtr obj);
-PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval
*in, zval* return_value, dom_object *domobj TSRMLS_DC);
-PHP_DOM_EXPORT(xmlNodePtr) dom_object_get_node(dom_object *obj);
+PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry;
+PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj);
+PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval
*in, zval* return_value, dom_object *domobj TSRMLS_DC);
+PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
#define DOM_XMLNS_NAMESPACE \
(const xmlChar *) "http://www.w3.org/2000/xmlns/";
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60.2.7&r2=1.60.2.8&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.60.2.7 php-src/ext/dom/php_dom.c:1.60.2.8
--- php-src/ext/dom/php_dom.c:1.60.2.7 Tue May 3 18:55:45 2005
+++ php-src/ext/dom/php_dom.c Wed Jun 22 15:58:33 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.60.2.7 2005/05/03 22:55:45 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.60.2.8 2005/06/22 19:58:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -34,6 +34,40 @@
#define PHP_XPATH 1
#define PHP_XPTR 2
+zend_class_entry *dom_node_class_entry;
+zend_class_entry *dom_domexception_class_entry;
+zend_class_entry *dom_domstringlist_class_entry;
+zend_class_entry *dom_namelist_class_entry;
+zend_class_entry *dom_domimplementationlist_class_entry;
+zend_class_entry *dom_domimplementationsource_class_entry;
+zend_class_entry *dom_domimplementation_class_entry;
+zend_class_entry *dom_documentfragment_class_entry;
+zend_class_entry *dom_document_class_entry;
+zend_class_entry *dom_nodelist_class_entry;
+zend_class_entry *dom_namednodemap_class_entry;
+zend_class_entry *dom_characterdata_class_entry;
+zend_class_entry *dom_attr_class_entry;
+zend_class_entry *dom_element_class_entry;
+zend_class_entry *dom_text_class_entry;
+zend_class_entry *dom_comment_class_entry;
+zend_class_entry *dom_typeinfo_class_entry;
+zend_class_entry *dom_userdatahandler_class_entry;
+zend_class_entry *dom_domerror_class_entry;
+zend_class_entry *dom_domerrorhandler_class_entry;
+zend_class_entry *dom_domlocator_class_entry;
+zend_class_entry *dom_domconfiguration_class_entry;
+zend_class_entry *dom_cdatasection_class_entry;
+zend_class_entry *dom_documenttype_class_entry;
+zend_class_entry *dom_notation_class_entry;
+zend_class_entry *dom_entity_class_entry;
+zend_class_entry *dom_entityreference_class_entry;
+zend_class_entry *dom_processinginstruction_class_entry;
+zend_class_entry *dom_string_extend_class_entry;
+#if defined(LIBXML_XPATH_ENABLED)
+zend_class_entry *dom_xpath_class_entry;
+#endif
+zend_class_entry *dom_namespace_node_class_entry;
+
zend_object_handlers dom_object_handlers;
zend_object_handlers dom_ze1_object_handlers;
http://cvs.php.net/diff.php/php-src/ext/dom/dom_ce.h?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/dom/dom_ce.h
diff -u php-src/ext/dom/dom_ce.h:1.6 php-src/ext/dom/dom_ce.h:1.6.2.1
--- php-src/ext/dom/dom_ce.h:1.6 Thu Jan 8 12:32:03 2004
+++ php-src/ext/dom/dom_ce.h Wed Jun 22 15:58:33 2005
@@ -17,41 +17,41 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dom_ce.h,v 1.6 2004/01/08 17:32:03 sniper Exp $ */
+/* $Id: dom_ce.h,v 1.6.2.1 2005/06/22 19:58:33 rrichards Exp $ */
#ifndef DOM_CE_H
#define DOM_CE_H
-zend_class_entry *dom_domexception_class_entry;
-zend_class_entry *dom_domstringlist_class_entry;
-zend_class_entry *dom_namelist_class_entry;
-zend_class_entry *dom_domimplementationlist_class_entry;
-zend_class_entry *dom_domimplementationsource_class_entry;
-zend_class_entry *dom_domimplementation_class_entry;
-zend_class_entry *dom_documentfragment_class_entry;
-zend_class_entry *dom_document_class_entry;
-zend_class_entry *dom_nodelist_class_entry;
-zend_class_entry *dom_namednodemap_class_entry;
-zend_class_entry *dom_characterdata_class_entry;
-zend_class_entry *dom_attr_class_entry;
-zend_class_entry *dom_element_class_entry;
-zend_class_entry *dom_text_class_entry;
-zend_class_entry *dom_comment_class_entry;
-zend_class_entry *dom_typeinfo_class_entry;
-zend_class_entry *dom_userdatahandler_class_entry;
-zend_class_entry *dom_domerror_class_entry;
-zend_class_entry *dom_domerrorhandler_class_entry;
-zend_class_entry *dom_domlocator_class_entry;
-zend_class_entry *dom_domconfiguration_class_entry;
-zend_class_entry *dom_cdatasection_class_entry;
-zend_class_entry *dom_documenttype_class_entry;
-zend_class_entry *dom_notation_class_entry;
-zend_class_entry *dom_entity_class_entry;
-zend_class_entry *dom_entityreference_class_entry;
-zend_class_entry *dom_processinginstruction_class_entry;
-zend_class_entry *dom_string_extend_class_entry;
+extern zend_class_entry *dom_domexception_class_entry;
+extern zend_class_entry *dom_domstringlist_class_entry;
+extern zend_class_entry *dom_namelist_class_entry;
+extern zend_class_entry *dom_domimplementationlist_class_entry;
+extern zend_class_entry *dom_domimplementationsource_class_entry;
+extern zend_class_entry *dom_domimplementation_class_entry;
+extern zend_class_entry *dom_documentfragment_class_entry;
+extern zend_class_entry *dom_document_class_entry;
+extern zend_class_entry *dom_nodelist_class_entry;
+extern zend_class_entry *dom_namednodemap_class_entry;
+extern zend_class_entry *dom_characterdata_class_entry;
+extern zend_class_entry *dom_attr_class_entry;
+extern zend_class_entry *dom_element_class_entry;
+extern zend_class_entry *dom_text_class_entry;
+extern zend_class_entry *dom_comment_class_entry;
+extern zend_class_entry *dom_typeinfo_class_entry;
+extern zend_class_entry *dom_userdatahandler_class_entry;
+extern zend_class_entry *dom_domerror_class_entry;
+extern zend_class_entry *dom_domerrorhandler_class_entry;
+extern zend_class_entry *dom_domlocator_class_entry;
+extern zend_class_entry *dom_domconfiguration_class_entry;
+extern zend_class_entry *dom_cdatasection_class_entry;
+extern zend_class_entry *dom_documenttype_class_entry;
+extern zend_class_entry *dom_notation_class_entry;
+extern zend_class_entry *dom_entity_class_entry;
+extern zend_class_entry *dom_entityreference_class_entry;
+extern zend_class_entry *dom_processinginstruction_class_entry;
+extern zend_class_entry *dom_string_extend_class_entry;
#if defined(LIBXML_XPATH_ENABLED)
-zend_class_entry *dom_xpath_class_entry;
+extern zend_class_entry *dom_xpath_class_entry;
#endif
-zend_class_entry *dom_namespace_node_class_entry;
+extern zend_class_entry *dom_namespace_node_class_entry;
#endif /* DOM_CE_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
