pajoye Mon May 14 09:23:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/xmlwriter/tests bug41287.phpt bug41326.phpt
Log:
- [EMAIL PROTECTED] MFH: #41326, better fix. It restores BC and allows both
canonical
and short form:
- when $content is given, the closing tag will be generated (even for empty
string)
- when $content is ignored or NULL is given, the short form will be used
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.14&r2=1.20.2.12.2.15&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.14
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.14 Tue May 8
21:41:36 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c Mon May 14 09:23:49 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.14 2007/05/08 21:41:36 pajoye Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15 2007/05/14 09:23:49 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -769,7 +769,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!",
&name, &name_len, &content, &content_len) == FAILURE) {
return;
}
@@ -777,7 +777,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss",
&pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s!",
&pind,
&name, &name_len, &content, &content_len) == FAILURE) {
return;
}
@@ -789,7 +789,7 @@
ptr = intern->ptr;
if (ptr) {
- if (!content || content_len < 1) {
+ if (!content) {
retval = xmlTextWriterStartElement(ptr, (xmlChar
*)name);
if (retval == -1) {
RETURN_FALSE;
@@ -824,7 +824,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!|s",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"s!ss!|s!",
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len,
&content, &content_len) == FAILURE) {
return;
}
@@ -832,7 +832,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rs!ss!|s", &pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rs!ss!|s!", &pind,
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len,
&content, &content_len) == FAILURE) {
return;
}
@@ -844,7 +844,7 @@
ptr = intern->ptr;
if (ptr) {
- if (!content || content_len < 1) {
+ if (!content) {
retval = xmlTextWriterStartElementNS(ptr,(xmlChar
*)prefix, (xmlChar *)name, (xmlChar *)uri);
if (retval == -1) {
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug41287.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/bug41287.phpt
diff -u php-src/ext/xmlwriter/tests/bug41287.phpt:1.1.2.2
php-src/ext/xmlwriter/tests/bug41287.phpt:1.1.2.3
--- php-src/ext/xmlwriter/tests/bug41287.phpt:1.1.2.2 Tue May 8 21:41:36 2007
+++ php-src/ext/xmlwriter/tests/bug41287.phpt Mon May 14 09:23:49 2007
@@ -30,14 +30,14 @@
--EXPECTF--
<?xml version="1.0"?>
<test:test xmlns:test="urn:x-test:">
- <test:foo/>
- <bar xmlns="urn:x-test:"/>
- <bar xmlns=""/>
+ <test:foo></test:foo>
+ <bar xmlns="urn:x-test:"></bar>
+ <bar xmlns=""></bar>
</test:test>
<?xml version="1.0"?>
<test:test xmlns:test="urn:x-test:">
- <test:foo/>
- <bar xmlns="urn:x-test:"/>
- <bar xmlns=""/>
+ <test:foo></test:foo>
+ <bar xmlns="urn:x-test:"></bar>
+ <bar xmlns=""></bar>
</test:test>
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug41326.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/bug41326.phpt
diff -u php-src/ext/xmlwriter/tests/bug41326.phpt:1.1.2.2
php-src/ext/xmlwriter/tests/bug41326.phpt:1.1.2.3
--- php-src/ext/xmlwriter/tests/bug41326.phpt:1.1.2.2 Tue May 8 21:41:36 2007
+++ php-src/ext/xmlwriter/tests/bug41326.phpt Mon May 14 09:23:49 2007
@@ -8,7 +8,8 @@
$xml->startDocument();
$xml->startElement('test');
$xml->writeElement('foo', null);
-$xml->writeElement('foo2', null);
+$xml->writeElement('foo2', "");
+$xml->writeElement('foo3');
$xml->startElement('bar');
$xml->endElement('bar');
$xml->endElement();
@@ -23,6 +24,8 @@
$xw->startElementNS('test', 'test', 'urn:x-test:');
$xw->writeElementNS('test', 'foo', null, '');
$xw->writeElementNS(null, 'bar', 'urn:x-test:', '');
+$xw->writeElementNS(null, 'bar', 'urn:x-test:', NULL);
+$xw->writeElementNS(null, 'bar', 'urn:x-test:');
$xw->writeElementNS(null, 'bar', '', '');
$xw->endElement();
$xw->endDocument();
@@ -32,13 +35,16 @@
<?xml version="1.0"?>
<test>
<foo/>
- <foo2/>
+ <foo2></foo2>
+ <foo3/>
<bar/>
</test>
<?xml version="1.0"?>
<test:test xmlns:test="urn:x-test:">
- <test:foo/>
+ <test:foo></test:foo>
+ <bar xmlns="urn:x-test:"></bar>
<bar xmlns="urn:x-test:"/>
- <bar xmlns=""/>
+ <bar xmlns="urn:x-test:"/>
+ <bar xmlns=""></bar>
</test:test>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
