MFH: parameter entity argument (pe) should be bool

update test

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 84f1522c2024ce6cf80d8c13276e1c2fd0b163c2..ac823b217b38f38173d0191065e9ae6bb9d00630 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -1347,13 +1347,14 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
        int name_len, content_len, retval;
        /* Optional parameters */
        char *pubid = NULL, *sysid = NULL, *ndataid = NULL;
-       int pe = 0, pubid_len, sysid_len, ndataid_len;
+       zend_bool pe = 0;
+       int pubid_len, sysid_len, ndataid_len;
 
 #ifdef ZEND_ENGINE_2
        zval *this = getThis();
 
        if (this) {
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|lsss",
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bsss",
                        &name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
                        &sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
                        return;
@@ -1362,7 +1363,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
        } else
 #endif
        {
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|lsss", &pind, 
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|bsss", &pind, 
                        &name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
                        &sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
                        return;

diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt
index 3b70f6a2f21eab77f422a34fb9c77a9a9371a67a..669c77ee24ae4cedf496d546d8e98e56ba184a60 100644 (file)
--- a/ext/xmlwriter/tests/bug39504.phpt
+++ b/ext/xmlwriter/tests/bug39504.phpt
@@ -11,8 +11,22 @@ xmlwriter_end_dtd($xw);
 xmlwriter_start_element($xw, "root");
 xmlwriter_end_document($xw);
 print xmlwriter_flush($xw, true);
+print "\n";
+
+$xw = new XMLWriter();
+$xw->openMemory();
+$xw->startDocument(NULL, "UTF-8");
+$xw->startDtd("root");
+$xw->writeDtdEntity("c", NULL, 0, "-//W3C//TEXT copyright//EN", "http://www.w3.org/xmlspec/copyright.xml");
+$xw->endDtd();
+$xw->startElement("root");
+$xw->endDocument();
+print $xw->flush(true);
 
 ?>
 --EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE root [<!ENTITY ent2 "val2">]><root/>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE root [<!ENTITY c PUBLIC "-//W3C//TEXT copyright//EN" "http://www.w3.org/xmlspec/copyright.xml">]><root/>