- MFH Fix parameter parsing

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index a1d374a44a6d84bb382f663ce7ed27463e23cbb5..985343bbce99c95f3a7b6144b13dad2f3253dba8 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1283,7 +1283,8 @@ PHP_FUNCTION(simplexml_load_file)
        int             filename_len;
        xmlDocPtr       docp;
        char           *classname = "";
-       int             classname_len = 0, options=0;
+       int             classname_len = 0;
+       long            options = 0;
        zend_class_entry *ce= sxe_class_entry;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sl", &filename, &filename_len, &classname, &classname_len, &options) == FAILURE) {
@@ -1326,7 +1327,8 @@ PHP_FUNCTION(simplexml_load_string)
        int             data_len;
        xmlDocPtr       docp;
        char           *classname = "";
-       int             classname_len = 0, options=0;
+       int             classname_len = 0;
+       long            options = 0;
        zend_class_entry *ce= sxe_class_entry;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sl", &data, &data_len, &classname, &classname_len, &options) == FAILURE) {
@@ -1361,7 +1363,7 @@ PHP_FUNCTION(simplexml_load_string)
 /* }}} */
 
 
-/* {{{ proto SimpleXMLElement::__construct()
+/* {{{ proto SimpleXMLElement::__construct(string data)
    SimpleXMLElement constructor */
 SXE_METHOD(__construct)
 {

diff --git a/ext/simplexml/tests/sxe.dtd b/ext/simplexml/tests/sxe.dtd
index 8a8dde4308a74cf1bf0a6c69fb3d9e5973ccb6d7..b75a7922b0909ecf5961a70405251d78e9d7ed91 100755 (executable)
--- a/ext/simplexml/tests/sxe.dtd
+++ b/ext/simplexml/tests/sxe.dtd
@@ -1,21 +1,34 @@
 <?xml encoding='US-ASCII'?>\r
 \r
-<!ELEMENT sxe    elem1, elem 11>\r
+<!ELEMENT sxe    (elem1+, elem11, elem22*)>\r
 <!ATTLIST sxe    id     CDATA  #implied>\r
 \r
-<!ELEMENT elem1  elem2>\r
+<!ELEMENT elem1  elem2*>\r
 <!ATTLIST elem1  attr1  CDATA  #required\r
                  attr2  CDATA  "default>\r
 \r
-<!ELEMENT elem2  elem3>\r
-<!ATTLIST elem2>\r
+<!ELEMENT elem2  elem3*>\r
+<!ATTLIST elem2  att25  CDATA  #implied\r
+                 att42  CDATA  #implied>\r
 \r
-<!ELEMENT elem3  elem4>\r
+<!ELEMENT elem3  elem4*>\r
 <!ATTLIST elem3>\r
 \r
 <!ELEMENT elem4  EMPTY>\r
 <!ATTLIST elem4>\r
 \r
-<!ELEMENT elem11 EMPTY>\r
+<!ELEMENT elem11 elem111*>\r
 <!ATTLIST elem11>\r
 \r
+<!ELEMNET elem111 elem1111*>\r
+<!ATTLIST elem111>\r
+\r
+<!ELEMENT elem1111 EMPTY>\r
+<!ATTLIST elem1111>\r
+\r
+<!ELEMENT elem22 elem222*>\r
+<!ATTLIST elem22 attr22 CDATA #implied>\r
+\r
+<!ELEMENT elem222 EMPTY>\r
+<!ATTLIST elem222>\r
+\r