cvs: php-src /ext/soap php_encoding.c
| From: | Dmitry Stogov | Date: | Tue, 17 Feb 2004 18:54:30 +0000 |
| Subject: | cvs: php-src /ext/soap php_encoding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26257@lists.php.net to get a copy of this message | ||
dmitry Tue Feb 17 13:54:30 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Using element namesapces with literal encoding.
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.60&r2=1.61&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.60 php-src/ext/soap/php_encoding.c:1.61
--- php-src/ext/soap/php_encoding.c:1.60 Tue Feb 17 10:10:16 2004
+++ php-src/ext/soap/php_encoding.c Tue Feb 17 13:54:30 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.60 2004/02/17 15:10:16 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.61 2004/02/17 18:54:30 dmitry Exp $ */
#include <time.h>
@@ -992,6 +992,10 @@
property = master_to_xml(enc, *val, style, node);
}
xmlNodeSetName(property, model->u.element->name);
+ if (style == SOAP_LITERAL && model->u.element->namens) {
+ xmlNsPtr nsp = encode_add_ns(property, model->u.element->namens);
+ xmlSetNs(property, nsp);
+ }
zend_hash_move_forward(ht);
}
} else {
@@ -1008,6 +1012,10 @@
property = master_to_xml(enc, *data, style, node);
}
xmlNodeSetName(property, model->u.element->name);
+ if (style == SOAP_LITERAL && model->u.element->namens) {
+ xmlNsPtr nsp = encode_add_ns(property, model->u.element->namens);
+ xmlSetNs(property, nsp);
+ }
}
return 1;
} else if (model->min_occurs == 0) {
@@ -1162,8 +1170,8 @@
if (prop != NULL) {
sdlTypePtr array_el;
- if (Z_TYPE_P(data) == IS_ARRAY &&
- !is_map(data) &&
+ if (Z_TYPE_P(data) == IS_ARRAY &&
+ !is_map(data) &&
sdlType->attributes == NULL &&
sdlType->model != NULL &&
(array_el = model_array_element(sdlType->model)) != NULL) {
@@ -1185,6 +1193,10 @@
property = master_to_xml(array_el->encode, *val, style, xmlParam);
}
xmlNodeSetName(property, array_el->name);
+ if (style == SOAP_LITERAL && array_el->namens) {
+ xmlNsPtr nsp = encode_add_ns(property, array_el->namens);
+ xmlSetNs(property, nsp);
+ }
zend_hash_move_forward(prop);
}
} else if (sdlType->model) {