Fixed bug #34788 (SOAP Client not applying correct namespace to generated values)

This commit is contained in:
Dmitry Stogov 2005-10-09 12:41:44 +00:00
parent 5dd9ad8f53
commit 303a642a0d
2 changed files with 9 additions and 1 deletions

2
NEWS
View File

@ -43,6 +43,8 @@ PHP NEWS
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
- Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
- Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)

View File

@ -1380,7 +1380,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
}
}
return 1;
} else if (strict && model->u.element->nillable) {
} else if (strict && model->u.element->nillable && model->min_occurs > 0) {
property = xmlNewNode(NULL,model->u.element->name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
@ -1389,6 +1389,12 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE);
xmlSetNsProp(property, xsi, "nil", "true");
}
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);
}
return 1;
} else if (model->min_occurs == 0) {
return 2;