From e3f351ddb00f6b774a45037882543637c89247d3 Mon Sep 17 00:00:00 2001
From: Sterling Hughes <sterling@php.net>
Date: Sun, 18 May 2003 20:53:21 +0000
Subject: [PATCH] make arrays of subnodes work (hacky) drop property support
 for the moment, this will be re-added soonish

---
 ext/simplexml/simplexml.c | 66 +++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 4a018ac3bd..8d19513129 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -42,16 +42,41 @@ php_sxe_fetch_object(zval *object TSRMLS_DC)
 }
 /* }}} */
 
+/* {{{ _node_as_zval()
+ */
+static void
+_node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value)
+{
+	char *contents;
+
+	contents = xmlNodeListGetString(sxe->document, node->xmlChildrenNode, 1);
+	if (contents) {
+		ZVAL_STRING(value, contents, 1);
+		xmlFree(contents);
+	} else {
+		php_sxe_object *subnode;
+
+		subnode = php_sxe_object_new(TSRMLS_C);
+		subnode->document = sxe->document;
+		subnode->node = node;
+
+		value->type = IS_OBJECT;
+		value->value.obj = php_sxe_register_object(subnode TSRMLS_CC);
+	}
+}
+/* }}} */
+
 /* {{{ sxe_property_read()
  */
 static zval *
 sxe_property_read(zval *object, zval *member TSRMLS_DC)
 {
 	zval           *return_value;
+	zval           *value;
 	php_sxe_object *sxe;
 	char           *name;
-	char           *content;
 	xmlNodePtr      node;
+	int             counter = 0;
 
 	MAKE_STD_ZVAL(return_value);
 	ZVAL_NULL(return_value);
@@ -59,7 +84,7 @@ sxe_property_read(zval *object, zval *member TSRMLS_DC)
 	name = Z_STRVAL_P(member);
 
 	sxe = php_sxe_fetch_object(object TSRMLS_CC);
-	
+
 	if (sxe->node == NULL) {
 		sxe->node = node = xmlDocGetRootElement(sxe->document)->xmlChildrenNode;
 	} else {
@@ -68,34 +93,27 @@ sxe_property_read(zval *object, zval *member TSRMLS_DC)
 
 	while (node) {
 		if (!xmlStrcmp(node->name, name)) {
-			break;
+			if (counter == 1) {
+				array_init(return_value);
+				add_next_index_zval(return_value, value);
+			}
+
+			MAKE_STD_ZVAL(value);
+			_node_as_zval(sxe, node, value);
+			
+			if (++counter > 1) {
+				add_next_index_zval(return_value, value);
+			}
 		}
 
 		node = node->next;
 	}
 
-	if (node) {
-		if ((content = xmlNodeListGetString(sxe->document, node->xmlChildrenNode, 1)) == NULL) {
-			php_sxe_object *subnode;
-
-			subnode = php_sxe_object_new(TSRMLS_C);
-			subnode->document = sxe->document;
-			subnode->node = node;
-
-			return_value->type = IS_OBJECT;
-			return_value->value.obj = php_sxe_register_object(subnode TSRMLS_CC);
-		} else {
-			RETVAL_STRING(content, 1);
-			xmlFree(content);
-		}
-	} else {
-		content = xmlGetProp(sxe->node, (const xmlChar *) name);
-		if (content != NULL) {
-			RETVAL_STRING(content, 1);
-			xmlFree(content);
-		}
+	if (counter == 1) {
+		return_value = value;
 	}
-		
+
+			
 	return return_value;
 }
 /* }}} */
-- 
2.40.0