cvs: php4 /ext/domxml php_domxml.c
| From: | Joey Smith | Date: | Sun, 08 Jul 2001 00:54:27 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6117@lists.php.net to get a copy of this message | ||
joey Sat Jul 7 20:54:27 2001 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
This should get xmldocfile() working again.
This should fix bugs:
11192, 10899
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.39 php4/ext/domxml/php_domxml.c:1.40
--- php4/ext/domxml/php_domxml.c:1.39 Thu May 24 06:06:59 2001
+++ php4/ext/domxml/php_domxml.c Sat Jul 7 20:54:25 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.39 2001/05/24 10:06:59 ssb Exp $ */
+/* $Id: php_domxml.c,v 1.40 2001/07/08 00:54:25 joey Exp $ */
#ifdef HAVE_CONFIG_H
@@ -2123,7 +2123,7 @@
Creates DOM object of XML document in file*/
PHP_FUNCTION(xmldocfile)
{
- zval *arg;
+ zval *arg, *rv;
xmlDoc *docp;
int ret;
@@ -2137,9 +2137,12 @@
RETURN_FALSE;
}
ret = zend_list_insert(docp, le_domxmldocp);
+
+ rv = php_domobject_new((xmlNodePtr) docp, &ret);
+ SEPARATE_ZVAL(&rv);
+ *return_value = *rv;
+ FREE_ZVAL(rv);
- /* construct an object with some methods */
- object_init_ex(return_value, domxmldoc_class_entry);
add_property_resource(return_value, "doc", ret);
if(docp->name)
add_property_stringl(return_value, "name", (char *) docp->name,
strlen(docp->name), 1);