rrichards Sat Jan 6 18:03:15 2007 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/xmlwriter/tests bug39504.phpt
Log:
parameter entity argument (pe) should be bool
update test
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.44
php-src/ext/xmlwriter/php_xmlwriter.c:1.45
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.44 Sat Jan 6 15:53:55 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c Sat Jan 6 18:03:15 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.44 2007/01/06 15:53:55 bjori Exp $ */
+/* $Id: php_xmlwriter.c,v 1.45 2007/01/06 18:03:15 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1366,13 +1366,14 @@
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,
"s&s&|ls&s&s&",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"s&s&|bs&s&s&",
&name, &name_len, UG(utf8_conv), &content,
&content_len, UG(utf8_conv),
&pe, &pubid, &pubid_len, UG(utf8_conv), &sysid,
&sysid_len, UG(utf8_conv),
&ndataid, &ndataid_len, UG(utf8_conv)) == FAILURE) {
@@ -1382,7 +1383,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rs&s&|ls&s&s&", &pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rs&s&|bs&s&s&", &pind,
&name, &name_len, UG(utf8_conv), &content,
&content_len, UG(utf8_conv),
&pe, &pubid, &pubid_len, UG(utf8_conv), &sysid,
&sysid_len, UG(utf8_conv),
&ndataid, &ndataid_len, UG(utf8_conv)) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug39504.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/bug39504.phpt
diff -u php-src/ext/xmlwriter/tests/bug39504.phpt:1.2
php-src/ext/xmlwriter/tests/bug39504.phpt:1.3
--- php-src/ext/xmlwriter/tests/bug39504.phpt:1.2 Tue Dec 5 23:03:42 2006
+++ php-src/ext/xmlwriter/tests/bug39504.phpt Sat Jan 6 18:03:15 2007
@@ -11,8 +11,22 @@
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/>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
