rrichards Fri May 4 20:16:40 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xmlwriter/tests bug41287.phpt
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
Fix bug #41287 (Namespace functions don't allow xmlns to be optional)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.12&r2=1.20.2.12.2.13&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.12
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.13
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.12 Sat Jan 6
18:03:43 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c Fri May 4 20:16:39 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.12 2007/01/06 18:03:43 rrichards Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.13 2007/05/04 20:16:39 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -566,7 +566,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss!",
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len)
== FAILURE) {
return;
}
@@ -574,7 +574,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss",
&pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss!",
&pind,
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len)
== FAILURE) {
return;
}
@@ -656,7 +656,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss!s",
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len,
&content, &content_len) == FAILURE) {
return;
}
@@ -664,7 +664,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssss",
&pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss!s",
&pind,
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len,
&content, &content_len) == FAILURE) {
return;
}
@@ -709,7 +709,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss!",
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len)
== FAILURE) {
return;
}
@@ -717,7 +717,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss",
&pind,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss!",
&pind,
&prefix, &prefix_len, &name, &name_len, &uri, &uri_len)
== FAILURE) {
return;
}
@@ -813,7 +813,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!sss",
+ 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;
}
@@ -821,7 +821,7 @@
} else
#endif
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!sss",
&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;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug41287.phpt?view=markup&rev=1.1
Index: php-src/ext/xmlwriter/tests/bug41287.phpt
+++ php-src/ext/xmlwriter/tests/bug41287.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
