cvs: php-src(PHP_5_1) /ext/soap php_encoding.c

dmitry Thu Sep 29 06:02:12 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/soap php_encoding.c Log: Fixed wrong array autodetection http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.2&r2=1.103.2.3&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.2 php-src/ext/soap/php_encoding.c:1.103.2.3 --- php-src/ext/soap/php_encoding.c:1.103.2.2 Fri Sep 16 13:11:00 2005 +++ php-src/ext/soap/php_encoding.c Thu Sep 29 06:02:11 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.2 2005/09/16 17:11:00 tony2001 Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.3 2005/09/29 10:02:11 dmitry Exp $ */ #include <time.h> @@ -1321,7 +1321,9 @@ data = get_zval_property(object, model->u.element->name TSRMLS_CC); if (data) { enc = model->u.element->encode; - if ((model->max_occurs == -1 || model->max_occurs > 1) && Z_TYPE_P(data) == IS_ARRAY) { + if ((model->max_occurs == -1 || model->max_occurs > 1) && + Z_TYPE_P(data) == IS_ARRAY && + !is_map(data)) { HashTable *ht = Z_ARRVAL_P(data); zval **val; @@ -1344,7 +1346,9 @@ } } xmlNodeSetName(property, model->u.element->name); - if (style == SOAP_LITERAL && model->u.element->namens) { + if (style == SOAP_LITERAL && + model->u.element->namens && + model->u.element->form == XSD_FORM_QUALIFIED) { xmlNsPtr nsp = encode_add_ns(property, model->u.element->namens); xmlSetNs(property, nsp); } @@ -1404,7 +1408,9 @@ data = get_zval_property(object, "any" TSRMLS_CC); if (data) { enc = get_conversion(XSD_ANYXML); - if ((model->max_occurs == -1 || model->max_occurs > 1) && Z_TYPE_P(data) == IS_ARRAY) { + if ((model->max_occurs == -1 || model->max_occurs > 1) && + Z_TYPE_P(data) == IS_ARRAY && + !is_map(data)) { HashTable *ht = Z_ARRVAL_P(data); zval **val; @@ -1599,7 +1605,9 @@ property = master_to_xml(array_el->encode, *val, style, xmlParam); } xmlNodeSetName(property, array_el->name); - if (style == SOAP_LITERAL && array_el->namens) { + if (style == SOAP_LITERAL && + array_el->namens && + array_el->form == XSD_FORM_QUALIFIED) { xmlNsPtr nsp = encode_add_ns(property, array_el->namens); xmlSetNs(property, nsp); }